svn commit: samba r23576 - in branches: SAMBA_3_0/source/lib SAMBA_3_0_26/source/lib

[jpeach at samba.org]

Author: jpeach
Date: 2007-06-21 21:17:06 +0000 (Thu, 21 Jun 2007)
New Revision: 23576

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

Log:
Fix some confusion between HAVE_BROKEN_GETGROUPS and USE_BSD_SETGROUPS.

Modified:
   branches/SAMBA_3_0/source/lib/system.c
   branches/SAMBA_3_0_26/source/lib/system.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/system.c
===================================================================
--- branches/SAMBA_3_0/source/lib/system.c	2007-06-21 20:56:56 UTC (rev 23575)
+++ branches/SAMBA_3_0/source/lib/system.c	2007-06-21 21:17:06 UTC (rev 23576)
@@ -1022,7 +1022,7 @@
 		setlen = max;
 	}
 
-#if defined(BROKEN_GETGROUPS)
+#if defined(HAVE_BROKEN_GETGROUPS)
 	ret = sys_broken_setgroups(setlen, new_gidset ? new_gidset : gidset);
 #else
 	ret = setgroups(setlen, new_gidset ? new_gidset : gidset);
@@ -1063,10 +1063,10 @@
 	return -1;
 #endif /* HAVE_SETGROUPS */
 
-#if defined(HAVE_BROKEN_GETGROUPS)
+#if defined(USE_BSD_SETGROUPS)
+	return sys_bsd_setgroups(primary_gid, setlen, gidset);
+#elif defined(HAVE_BROKEN_GETGROUPS)
 	return sys_broken_setgroups(setlen, gidset);
-#elif defined(USE_BSD_SETGROUPS)
-	return sys_bsd_setgroups(primary_gid, setlen, gidset);
 #else
 	return setgroups(setlen, gidset);
 #endif

Modified: branches/SAMBA_3_0_26/source/lib/system.c
===================================================================
--- branches/SAMBA_3_0_26/source/lib/system.c	2007-06-21 20:56:56 UTC (rev 23575)
+++ branches/SAMBA_3_0_26/source/lib/system.c	2007-06-21 21:17:06 UTC (rev 23576)
@@ -1022,7 +1022,7 @@
 		setlen = max;
 	}
 
-#if defined(BROKEN_GETGROUPS)
+#if defined(HAVE_BROKEN_GETGROUPS)
 	ret = sys_broken_setgroups(setlen, new_gidset ? new_gidset : gidset);
 #else
 	ret = setgroups(setlen, new_gidset ? new_gidset : gidset);
@@ -1063,10 +1063,10 @@
 	return -1;
 #endif /* HAVE_SETGROUPS */
 
-#if defined(HAVE_BROKEN_GETGROUPS)
+#if defined(USE_BSD_SETGROUPS)
+	return sys_bsd_setgroups(primary_gid, setlen, gidset);
+#elif defined(HAVE_BROKEN_GETGROUPS)
 	return sys_broken_setgroups(setlen, gidset);
-#elif defined(USE_BSD_SETGROUPS)
-	return sys_bsd_setgroups(primary_gid, setlen, gidset);
 #else
 	return setgroups(setlen, gidset);
 #endif