summaryrefslogtreecommitdiff
path: root/source3/rpc_parse/parse_misc.c
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1999-02-23 22:39:54 +0000
committerLuke Leighton <lkcl@samba.org>1999-02-23 22:39:54 +0000
commit1e71ecdcb21f24e70ee5edbbc05de0284fa588f4 (patch)
tree4c00ca048f4400e768c3611a35d77200a5ab1605 /source3/rpc_parse/parse_misc.c
parent5c5f5445384bf1c55ad28ee7c24b2cce14744a80 (diff)
downloadsamba-1e71ecdcb21f24e70ee5edbbc05de0284fa588f4.tar.gz
samba-1e71ecdcb21f24e70ee5edbbc05de0284fa588f4.tar.bz2
samba-1e71ecdcb21f24e70ee5edbbc05de0284fa588f4.zip
added jeremy's new c++-like code for parsing of security descriptors.
(This used to be commit ec1b7000fd88c5a08e438c7033f60e49b9ec44a8)
Diffstat (limited to 'source3/rpc_parse/parse_misc.c')
-rw-r--r--source3/rpc_parse/parse_misc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 12501a5e57..3cffde0249 100644
--- 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.
********************************************************************/
-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;
- if (sid == NULL) return;
+ if (sid == NULL) return False;
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);
+
+ return True;
}
/*******************************************************************
@@ -150,7 +152,7 @@ creates a DOM_SID2 structure.
********************************************************************/
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;
}
@@ -1048,4 +1050,3 @@ void smb_io_unistr3(char *desc, UNISTR3 *name, prs_struct *ps, int depth)
prs_unistr3(True, "unistr", name, ps, depth);
}
-