svn commit: samba r16114 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-06-09 10:33:29 +0000 (Fri, 09 Jun 2006)
New Revision: 16114

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

Log:
Make winbindd's group enumeration (set|get|endgrent) work again (when
enabled).

Do not bail out when a group just has 0 members.

Jeremy, please check, this has been removed with r13915.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_group.c
   trunk/source/nsswitch/winbindd_group.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_group.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_group.c	2006-06-09 01:37:00 UTC (rev 16113)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_group.c	2006-06-09 10:33:29 UTC (rev 16114)
@@ -789,7 +789,7 @@
 			/* Append to group membership list */
 			gr_mem_list = SMB_REALLOC( gr_mem_list, gr_mem_list_len + gr_mem_len);
 
-			if (!gr_mem_list) {
+			if (!gr_mem_list && (group_list[group_list_ndx].num_gr_mem != 0)) {
 				DEBUG(0, ("out of memory\n"));
 				gr_mem_list_len = 0;
 				break;

Modified: trunk/source/nsswitch/winbindd_group.c
===================================================================
--- trunk/source/nsswitch/winbindd_group.c	2006-06-09 01:37:00 UTC (rev 16113)
+++ trunk/source/nsswitch/winbindd_group.c	2006-06-09 10:33:29 UTC (rev 16114)
@@ -789,7 +789,7 @@
 			/* Append to group membership list */
 			gr_mem_list = SMB_REALLOC( gr_mem_list, gr_mem_list_len + gr_mem_len);
 
-			if (!gr_mem_list) {
+			if (!gr_mem_list && (group_list[group_list_ndx].num_gr_mem != 0)) {
 				DEBUG(0, ("out of memory\n"));
 				gr_mem_list_len = 0;
 				break;