added jeremy's new c++-like code for parsing of security descriptors.

[samba.git] / source3 / rpc_parse / parse_misc.c

diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 12501a5e57b6e8049d4071453b83e322e122059d..3cffde02498132464bbcf0005e8e854220d405e6 100644 (file)
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -118,11 +118,11 @@ void smb_io_enum_hnd(char *desc,  ENUM_HND *hnd, prs_struct *ps, int depth)
 /*******************************************************************
 reads or writes a DOM_SID structure.
 ********************************************************************/
 /*******************************************************************
 reads or writes a DOM_SID structure.
 ********************************************************************/

-void smb_io_dom_sid(char *desc,  DOM_SID *sid, prs_struct *ps, int depth)
+BOOL smb_io_dom_sid(char *desc,  DOM_SID *sid, prs_struct *ps, int depth)

 {
        int i;
 
 {
        int i;
 

-       if (sid == NULL) return;
+       if (sid == NULL) return False;

 
        prs_debug(ps, depth, desc, "smb_io_dom_sid");
        depth++;
 
        prs_debug(ps, depth, desc, "smb_io_dom_sid");
        depth++;


@@ -143,6 +143,8 @@ void smb_io_dom_sid(char *desc,  DOM_SID *sid, prs_struct *ps, int depth)
        if (sid->num_auths > MAXSUBAUTHS) sid->num_auths = MAXSUBAUTHS;
 
        prs_uint32s(False, "sub_auths ", ps, depth, sid->sub_auths, sid->num_auths);
        if (sid->num_auths > MAXSUBAUTHS) sid->num_auths = MAXSUBAUTHS;
 
        prs_uint32s(False, "sub_auths ", ps, depth, sid->sub_auths, sid->num_auths);

+
+       return True;

 }
 
 /*******************************************************************
 }
 
 /*******************************************************************


@@ -150,7 +152,7 @@ creates a DOM_SID2 structure.
 ********************************************************************/
 void make_dom_sid2(DOM_SID2 *sid2, DOM_SID *sid)
 {
 ********************************************************************/
 void make_dom_sid2(DOM_SID2 *sid2, DOM_SID *sid)
 {

-        sid_copy(&sid2->sid, sid);
+        sid2->sid = *sid;

        sid2->num_auths = sid2->sid.num_auths;
 }
 
        sid2->num_auths = sid2->sid.num_auths;
 }
 


@@ -1048,4 +1050,3 @@ void smb_io_unistr3(char *desc,  UNISTR3 *name, prs_struct *ps, int depth)
        prs_unistr3(True, "unistr", name, ps, depth);
 }
 
        prs_unistr3(True, "unistr", name, ps, depth);
 }
 

-