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

gd at samba.org gd at samba.org
Mon Aug 27 18:12:29 GMT 2007


Author: gd
Date: 2007-08-27 18:12:29 +0000 (Mon, 27 Aug 2007)
New Revision: 24713

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

Log:
Fix obvious error in enum_dom_groups. We were returning NT_STATUS_OK when the realloc failed.

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 18:10:19 UTC (rev 24712)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd_rpc.c	2007-08-27 18:12:29 UTC (rev 24713)
@@ -172,8 +172,7 @@
 					       (*num_entries) + count);
 		if (! *info) {
 			talloc_destroy(mem_ctx2);
-			status = NT_STATUS_NO_MEMORY;
-			break;
+			return NT_STATUS_NO_MEMORY;
 		}
 
 		memcpy(&(*info)[*num_entries], info2, count*sizeof(*info2));

Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_rpc.c
===================================================================
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_rpc.c	2007-08-27 18:10:19 UTC (rev 24712)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_rpc.c	2007-08-27 18:12:29 UTC (rev 24713)
@@ -172,8 +172,7 @@
 					       (*num_entries) + count);
 		if (! *info) {
 			talloc_destroy(mem_ctx2);
-			status = NT_STATUS_NO_MEMORY;
-			break;
+			return NT_STATUS_NO_MEMORY;
 		}
 
 		memcpy(&(*info)[*num_entries], info2, count*sizeof(*info2));



More information about the samba-cvs mailing list