summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-06-21 21:17:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:31 -0500
commit0e67063cbcac99d89dd9747b57ea1741b1a793b8 (patch)
treed7e601e2949e3a998e7e1c01bd123445373d324b
parent510ba543ccf8ab4c58a18e35c2f63df5de49d0c3 (diff)
downloadsamba-0e67063cbcac99d89dd9747b57ea1741b1a793b8.tar.gz
samba-0e67063cbcac99d89dd9747b57ea1741b1a793b8.tar.bz2
samba-0e67063cbcac99d89dd9747b57ea1741b1a793b8.zip
r23576: Fix some confusion between HAVE_BROKEN_GETGROUPS and USE_BSD_SETGROUPS.
(This used to be commit 8f6cf4b8c2568c737fa31494b844ae021a42a4fc)
-rw-r--r--source3/lib/system.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 9f62ce760a..3e9674d9d4 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1022,7 +1022,7 @@ static int sys_bsd_setgroups(gid_t primary_gid, int setlen, const gid_t *gidset)
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 @@ int sys_setgroups(gid_t UNUSED(primary_gid), int setlen, gid_t *gidset)
return -1;
#endif /* HAVE_SETGROUPS */
-#if defined(HAVE_BROKEN_GETGROUPS)
- return sys_broken_setgroups(setlen, gidset);
-#elif defined(USE_BSD_SETGROUPS)
+#if defined(USE_BSD_SETGROUPS)
return sys_bsd_setgroups(primary_gid, setlen, gidset);
+#elif defined(HAVE_BROKEN_GETGROUPS)
+ return sys_broken_setgroups(setlen, gidset);
#else
return setgroups(setlen, gidset);
#endif