svn commit: samba r23496 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch

jerry at samba.org jerry at samba.org
Thu Jun 14 14:12:54 GMT 2007


Author: jerry
Date: 2007-06-14 14:12:53 +0000 (Thu, 14 Jun 2007)
New Revision: 23496

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

Log:
Fix logic error in getgrnam_recv() that broke
getgrnam() for machine and domain local groups.


Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_group.c
   branches/SAMBA_3_0_26/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	2007-06-14 13:26:31 UTC (rev 23495)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_group.c	2007-06-14 14:12:53 UTC (rev 23496)
@@ -653,7 +653,7 @@
 		return;
 	}
 
- 	if ( !(type == SID_NAME_DOM_GRP) || (type == SID_NAME_ALIAS) ) {
+ 	if ( (type != SID_NAME_DOM_GRP) && (type != SID_NAME_ALIAS) ) {
 		DEBUG(5,("getgrnam_recv: not a group!\n"));
 		request_error(state);
 		return;

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_group.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_group.c	2007-06-14 13:26:31 UTC (rev 23495)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_group.c	2007-06-14 14:12:53 UTC (rev 23496)
@@ -653,7 +653,7 @@
 		return;
 	}
 
- 	if ( !(type == SID_NAME_DOM_GRP) || (type == SID_NAME_ALIAS) ) {
+ 	if ( (type != SID_NAME_DOM_GRP) && (type != SID_NAME_ALIAS) ) {
 		DEBUG(5,("getgrnam_recv: not a group!\n"));
 		request_error(state);
 		return;



More information about the samba-cvs mailing list