svn commit: samba r24165 - in branches: SAMBA_3_2/source/rpc_server SAMBA_3_2_0/source/rpc_server

[vlendec at samba.org]

Author: vlendec
Date: 2007-08-04 10:18:33 +0000 (Sat, 04 Aug 2007)
New Revision: 24165

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

Log:
Fix Coverity ID 369.

This was not really a bug I think, but this change cleans up the code a
bit.

Modified:
   branches/SAMBA_3_2/source/rpc_server/srv_lsa_nt.c
   branches/SAMBA_3_2_0/source/rpc_server/srv_lsa_nt.c


Changeset:
Modified: branches/SAMBA_3_2/source/rpc_server/srv_lsa_nt.c
===================================================================
--- branches/SAMBA_3_2/source/rpc_server/srv_lsa_nt.c	2007-08-03 16:51:43 UTC (rev 24164)
+++ branches/SAMBA_3_2/source/rpc_server/srv_lsa_nt.c	2007-08-04 10:18:33 UTC (rev 24165)
@@ -1517,16 +1517,16 @@
 			SAFE_FREE(sid_list);
 			return NT_STATUS_NO_MEMORY;
 		}
+
+		for (i = q_u->enum_context, j = 0; i < num_entries; i++, j++) {
+			init_dom_sid2(&(*sids).sid[j], &sid_list[i]);
+			(*sids).ptr_sid[j] = 1;
+		}
 	} else {
 		sids->ptr_sid = NULL;
 		sids->sid = NULL;
 	}
 
-	for (i = q_u->enum_context, j = 0; i < num_entries; i++, j++) {
-		init_dom_sid2(&(*sids).sid[j], &sid_list[i]);
-		(*sids).ptr_sid[j] = 1;
-	}
-
 	talloc_free(sid_list);
 
 	init_lsa_r_enum_accounts(r_u, num_entries);

Modified: branches/SAMBA_3_2_0/source/rpc_server/srv_lsa_nt.c
===================================================================
--- branches/SAMBA_3_2_0/source/rpc_server/srv_lsa_nt.c	2007-08-03 16:51:43 UTC (rev 24164)
+++ branches/SAMBA_3_2_0/source/rpc_server/srv_lsa_nt.c	2007-08-04 10:18:33 UTC (rev 24165)
@@ -1525,16 +1525,16 @@
 			SAFE_FREE(sid_list);
 			return NT_STATUS_NO_MEMORY;
 		}
+
+		for (i = q_u->enum_context, j = 0; i < num_entries; i++, j++) {
+			init_dom_sid2(&(*sids).sid[j], &sid_list[i]);
+			(*sids).ptr_sid[j] = 1;
+		}
 	} else {
 		sids->ptr_sid = NULL;
 		sids->sid = NULL;
 	}
 
-	for (i = q_u->enum_context, j = 0; i < num_entries; i++, j++) {
-		init_dom_sid2(&(*sids).sid[j], &sid_list[i]);
-		(*sids).ptr_sid[j] = 1;
-	}
-
 	talloc_free(sid_list);
 
 	init_lsa_r_enum_accounts(r_u, num_entries);