s3-registry: remove last sec_io_desc() caller.

[metze/samba/wip.git] / source3 / rpc_parse / parse_sec.c

diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c
index 6ea128d3a49cf61c9ecc902ea7d54d889cd4a5fd..91d8591a05d3dba41e98ab28b7b78e3c71a118c2 100644 (file)
--- a/source3/rpc_parse/parse_sec.c
+++ b/source3/rpc_parse/parse_sec.c
@@ -26,29 +26,12 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_PARSE
 
-/*******************************************************************
- Reads or writes a SEC_ACCESS structure.
-********************************************************************/
-
-bool sec_io_access(const char *desc, SEC_ACCESS *t, prs_struct *ps, int depth)
-{
-       if (t == NULL)
-               return False;
-
-       prs_debug(ps, depth, desc, "sec_io_access");
-       depth++;
-       
-       if(!prs_uint32("mask", ps, depth, t))
-               return False;
-
-       return True;
-}
-
 /*******************************************************************
  Reads or writes a SEC_ACE structure.
 ********************************************************************/
 
-bool sec_io_ace(const char *desc, SEC_ACE *psa, prs_struct *ps, int depth)
+static bool sec_io_ace(const char *desc, SEC_ACE *psa, prs_struct *ps,
+                      int depth)
 {
        uint32 old_offset;
        uint32 offset_ace_size;
@@ -90,11 +73,11 @@ bool sec_io_ace(const char *desc, SEC_ACE *psa, prs_struct *ps, int depth)
                if (!prs_uint32("obj_flags", ps, depth, &psa->object.object.flags))
                        return False;
 
-               if (psa->object.object.flags & SEC_ACE_OBJECT_PRESENT)
+               if (psa->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT)
                        if (!smb_io_uuid("obj_guid", &psa->object.object.type.type, ps,depth))
                                return False;
 
-               if (psa->object.object.flags & SEC_ACE_OBJECT_INHERITED_PRESENT)
+               if (psa->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT)
                        if (!smb_io_uuid("inh_guid", &psa->object.object.inherited_type.inherited_type, ps,depth))
                                return False;
 
@@ -130,7 +113,8 @@ bool sec_io_ace(const char *desc, SEC_ACE *psa, prs_struct *ps, int depth)
  for you as it reads them.
 ********************************************************************/
 
-bool sec_io_acl(const char *desc, SEC_ACL **ppsa, prs_struct *ps, int depth)
+static bool sec_io_acl(const char *desc, SEC_ACL **ppsa, prs_struct *ps,
+                      int depth)
 {
        unsigned int i;
        uint32 old_offset;
@@ -291,14 +275,14 @@ bool sec_io_desc(const char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth)
 
                if (psd->owner_sid != NULL) {
                        off_owner_sid = offset;
-                       offset += ndr_size_dom_sid(psd->owner_sid, 0);
+                       offset += ndr_size_dom_sid(psd->owner_sid, NULL, 0);
                } else {
                        off_owner_sid = 0;
                }
 
                if (psd->group_sid != NULL) {
                        off_grp_sid = offset;
-                       offset += ndr_size_dom_sid(psd->group_sid, 0);
+                       offset += ndr_size_dom_sid(psd->group_sid, NULL, 0);
                } else {
                        off_grp_sid = 0;
                }
@@ -426,7 +410,7 @@ bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF **ppsdb, prs_struct *ps, int
        if(!prs_uint32    ("ptr  ", ps, depth, &ptr))
                return False;
 
-       len = ndr_size_security_descriptor(psdb->sd, 0);
+       len = ndr_size_security_descriptor(psdb->sd, NULL, 0);
        if(!prs_uint32_pre("len    ", ps, depth, &len, &off_len))
                return False;