summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-05-01 16:49:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:50 -0500
commita127d5331a62c21fcf6013b3849e421af0f30924 (patch)
treef278501a2a5ac5469b64e7384ec474616196bddb
parentb3010b5d6bcaab6fcf48a11bae0a53e433f51ab7 (diff)
downloadsamba-a127d5331a62c21fcf6013b3849e421af0f30924.tar.gz
samba-a127d5331a62c21fcf6013b3849e421af0f30924.tar.bz2
samba-a127d5331a62c21fcf6013b3849e421af0f30924.zip
r22630: Revert svn r22576 (parse change to enum_aliasmem(). Original code was correct
(This used to be commit cf11b4314987d4d429d09e073c5294d3a9977c52)
-rw-r--r--source3/rpc_parse/parse_samr.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 49a1db75c0..296296ac5a 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/rpc_parse/parse_samr.c
@@ -4838,15 +4838,9 @@ BOOL samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
if(!prs_uint32("num_sids1", ps, depth, &r_u->num_sids1))
return False;
- if (UNMARSHALLING(ps)) {
- if (r_u->num_sids1) {
- ptr_sid = TALLOC_ARRAY(ps->mem_ctx, uint32, r_u->num_sids1);
- if (!ptr_sid) {
- return False;
- }
- } else {
- ptr_sid = NULL;
- }
+ ptr_sid = TALLOC_ARRAY(ps->mem_ctx, uint32, r_u->num_sids1);
+ if (!ptr_sid) {
+ return False;
}
for (i = 0; i < r_u->num_sids1; i++) {
@@ -4856,14 +4850,7 @@ BOOL samr_io_r_query_aliasmem(const char *desc, SAMR_R_QUERY_ALIASMEM * r_u,
}
if (UNMARSHALLING(ps)) {
- if (r_u->num_sids1) {
- r_u->sid = TALLOC_ARRAY(ps->mem_ctx, DOM_SID2, r_u->num_sids1);
- if (!r_u->sid) {
- return False;
- }
- } else {
- r_u->sid = NULL;
- }
+ r_u->sid = TALLOC_ARRAY(ps->mem_ctx, DOM_SID2, r_u->num_sids1);
}
for (i = 0; i < r_u->num_sids1; i++) {