r4627: - simplified the dcerpc auth code using a common function

[samba.git] / source4 / librpc / ndr / ndr_sec.c

diff --git a/source4/librpc/ndr/ndr_sec.c b/source4/librpc/ndr/ndr_sec.c
index 3ea0f4e30373bf4c9e75d6a579d67d9bb08d4909..798d3a7cf1dd0942c14982d25aa00c741b945a17 100644 (file)
--- a/source4/librpc/ndr/ndr_sec.c
+++ b/source4/librpc/ndr/ndr_sec.c
@@ -23,13 +23,14 @@
 
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
   parse a dom_sid2 - this is a dom_sid but with an extra copy of the num_auths field
 */
 NTSTATUS ndr_pull_dom_sid2(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid)
 {
-       uint32 num_auths;
+       uint32_t num_auths;
        if (!(ndr_flags & NDR_SCALARS)) {
                return NT_STATUS_OK;
        }
@@ -50,45 +51,12 @@ NTSTATUS ndr_push_dom_sid2(struct ndr_push *ndr, int ndr_flags, struct dom_sid *
 }
 
 
-/*
-  convert a dom_sid to a string
-*/
-const char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
-{
-       int i, ofs, maxlen;
-       uint32 ia;
-       char *ret;
-       
-       if (!sid) {
-               return "(NULL SID)";
-       }
-
-       maxlen = sid->num_auths * 11 + 25;
-       ret = talloc(mem_ctx, maxlen);
-       if (!ret) return "(SID ERR)";
-
-       ia = (sid->id_auth[5]) +
-               (sid->id_auth[4] << 8 ) +
-               (sid->id_auth[3] << 16) +
-               (sid->id_auth[2] << 24);
-
-       ofs = snprintf(ret, maxlen, "S-%u-%lu", 
-                      (unsigned int)sid->sid_rev_num, (unsigned long)ia);
-
-       for (i = 0; i < sid->num_auths; i++) {
-               ofs += snprintf(ret + ofs, maxlen - ofs, "-%lu", (unsigned long)sid->sub_auths[i]);
-       }
-       
-       return ret;
-}
-
-
 /*
   print a dom_sid
 */
 void ndr_print_dom_sid(struct ndr_print *ndr, const char *name, struct dom_sid *sid)
 {
-       ndr->print(ndr, "%-25s: %s", name, dom_sid_string(ndr->mem_ctx, sid));
+       ndr->print(ndr, "%-25s: %s", name, dom_sid_string(ndr, sid));
 }
 
 void ndr_print_dom_sid2(struct ndr_print *ndr, const char *name, struct dom_sid2 *sid)
@@ -105,29 +73,6 @@ size_t ndr_size_dom_sid(struct dom_sid *sid)
        return 8 + 4*sid->num_auths;
 }
 
-/*
-  add a rid to a domain dom_sid to make a full dom_sid
-*/
-struct dom_sid *dom_sid_add_rid(TALLOC_CTX *mem_ctx, 
-                               const struct dom_sid *domain_sid, 
-                               uint32 rid)
-{
-       struct dom_sid *sid;
-
-       sid = talloc_p(mem_ctx, struct dom_sid);
-       if (!sid) return NULL;
-
-       *sid = *domain_sid;
-       sid->sub_auths = talloc_array_p(mem_ctx, uint32, sid->num_auths+1);
-       if (!sid->sub_auths) {
-               return NULL;
-       }
-       memcpy(sid->sub_auths, domain_sid->sub_auths, sid->num_auths*sizeof(uint32));
-       sid->sub_auths[sid->num_auths] = rid;
-       sid->num_auths++;
-       return sid;
-}
-
 /*
   return the wire size of a security_ace
 */
@@ -168,18 +113,3 @@ size_t ndr_size_security_descriptor(struct security_descriptor *sd)
        ret += ndr_size_security_acl(sd->sacl);
        return ret;
 }
-
-/* 
-   talloc and copy a security descriptor
- */
-struct security_descriptor *copy_security_descriptor(TALLOC_CTX *mem_ctx, 
-                                                       const struct security_descriptor *osd)
-{
-       struct security_descriptor *nsd;
-
-       /* FIXME */
-       DEBUG(1, ("copy_security_descriptor: sorry unimplemented yet\n"));
-       nsd = NULL;
-
-       return nsd;
-}