svn commit: samba r22630 - in branches: SAMBA_3_0/source/rpc_parse SAMBA_3_0_25/source/rpc_parse

[jerry at samba.org]

Author: jerry
Date: 2007-05-01 16:49:00 +0000 (Tue, 01 May 2007)
New Revision: 22630

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22630

Log:
Revert svn r22576 (parse change to enum_aliasmem().  Original code was correct
Modified:
   branches/SAMBA_3_0/source/rpc_parse/parse_samr.c
   branches/SAMBA_3_0_25/source/rpc_parse/parse_samr.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_samr.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_samr.c	2007-05-01 09:55:36 UTC (rev 22629)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_samr.c	2007-05-01 16:49:00 UTC (rev 22630)
@@ -4838,15 +4838,9 @@
 		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 @@
 		}
 		
 		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++) {

Modified: branches/SAMBA_3_0_25/source/rpc_parse/parse_samr.c
===================================================================
--- branches/SAMBA_3_0_25/source/rpc_parse/parse_samr.c	2007-05-01 09:55:36 UTC (rev 22629)
+++ branches/SAMBA_3_0_25/source/rpc_parse/parse_samr.c	2007-05-01 16:49:00 UTC (rev 22630)
@@ -4768,15 +4768,9 @@
 		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++) {
@@ -4786,14 +4780,7 @@
 		}
 		
 		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++) {