summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-03-13 07:57:49 +0000
committerJeremy Allison <jra@samba.org>2003-03-13 07:57:49 +0000
commit71e94ca9046100fcfca409c77540fa046ea1577b (patch)
tree23fd4e609f68531b26c334630d2f02130fb817be
parent14672bed8f48978f5e8b5627823f35767e84ce9b (diff)
downloadsamba-71e94ca9046100fcfca409c77540fa046ea1577b.tar.gz
samba-71e94ca9046100fcfca409c77540fa046ea1577b.tar.bz2
samba-71e94ca9046100fcfca409c77540fa046ea1577b.zip
Merge from HEAD. 'fixed the unmarshalling of the queryaliasmem SAMR call'
Jeremy. (This used to be commit 40def80d43b14a853045a31b382226fe0381f38a)
-rw-r--r--source3/rpc_parse/parse_samr.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index d031d13955..222af57e5b 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -4623,13 +4623,17 @@ BOOL samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
for (i = 0; i < r_u->num_sids1; i++) {
ptr_sid[i] = 1;
- if(!prs_uint32("", ps, depth, &ptr_sid[i]))
+ if(!prs_uint32("ptr_sid", ps, depth, &ptr_sid[i]))
return False;
}
+ if (UNMARSHALLING(ps)) {
+ r_u->sid = talloc(ps->mem_ctx, r_u->num_sids1 * sizeof(DOM_SID));
+ }
+
for (i = 0; i < r_u->num_sids1; i++) {
if (ptr_sid[i] != 0) {
- if(!smb_io_dom_sid2("", &r_u->sid[i], ps, depth))
+ if(!smb_io_dom_sid2("sid", &r_u->sid[i], ps, depth))
return False;
}
}