svn commit: samba r24711 - in branches: SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2007-08-27 18:07:49 +0000 (Mon, 27 Aug 2007)
New Revision: 24711

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

Log:
Remove unused talloc context from query_user_list rpc.

Guenther

Modified:
   branches/SAMBA_3_2/source/nsswitch/winbindd_rpc.c
   branches/SAMBA_3_2_0/source/nsswitch/winbindd_rpc.c


Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd_rpc.c
===================================================================
--- branches/SAMBA_3_2/source/nsswitch/winbindd_rpc.c	2007-08-27 17:21:16 UTC (rev 24710)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd_rpc.c	2007-08-27 18:07:49 UTC (rev 24711)
@@ -61,7 +61,6 @@
 	loop_count = 0;
 
 	do {
-		TALLOC_CTX *ctx2;
 		uint32 num_dom_users, j;
 		uint32 max_entries, max_size;
 		SAM_DISPINFO_CTR ctr;
@@ -70,9 +69,6 @@
 		ZERO_STRUCT( ctr );
 		ZERO_STRUCT( info1 );
 		ctr.sam.info1 = &info1;
-	
-		if (!(ctx2 = talloc_init("winbindd enum_users")))
-			return NT_STATUS_NO_MEMORY;
 
 		/* this next bit is copied from net_user_list_internal() */
 
@@ -93,7 +89,6 @@
 					     *num_entries);
 
 		if (!(*info)) {
-			talloc_destroy(ctx2);
 			return NT_STATUS_NO_MEMORY;
 		}
 
@@ -122,8 +117,6 @@
 				    DOMAIN_GROUP_RID_USERS);
 		}
 
-		talloc_destroy(ctx2);
-
 	} while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 
 	return result;

Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_rpc.c
===================================================================
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_rpc.c	2007-08-27 17:21:16 UTC (rev 24710)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_rpc.c	2007-08-27 18:07:49 UTC (rev 24711)
@@ -61,7 +61,6 @@
 	loop_count = 0;
 
 	do {
-		TALLOC_CTX *ctx2;
 		uint32 num_dom_users, j;
 		uint32 max_entries, max_size;
 		SAM_DISPINFO_CTR ctr;
@@ -70,9 +69,6 @@
 		ZERO_STRUCT( ctr );
 		ZERO_STRUCT( info1 );
 		ctr.sam.info1 = &info1;
-	
-		if (!(ctx2 = talloc_init("winbindd enum_users")))
-			return NT_STATUS_NO_MEMORY;
 
 		/* this next bit is copied from net_user_list_internal() */
 
@@ -93,7 +89,6 @@
 					     *num_entries);
 
 		if (!(*info)) {
-			talloc_destroy(ctx2);
 			return NT_STATUS_NO_MEMORY;
 		}
 
@@ -122,8 +117,6 @@
 				    DOMAIN_GROUP_RID_USERS);
 		}
 
-		talloc_destroy(ctx2);
-
 	} while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 
 	return result;