From: Gerald Carter <jerry@samba.org>
Date: Tue, 1 May 2007 16:49:00 +0000 (+0000)
Subject: r22630: Revert svn r22576 (parse change to enum_aliasmem().  Original code was correct
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~569
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf11b4314987d4d429d09e073c5294d3a9977c52;p=thirdparty%2Fsamba.git

r22630: Revert svn r22576 (parse change to enum_aliasmem().  Original code was correct
---

diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 49a1db75c00..296296ac5a3 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/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++) {