diff options
| author | Wayne Davison <wayned@samba.org> | 2004-02-04 17:49:36 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2004-02-04 17:49:36 +0000 |
| commit | 1df395f7c211698420488a3f6600fd5cf50b7785 (patch) | |
| tree | 0da20d64d22cd878df8d36a3f97dc131f09c8ad1 | |
| parent | 5fdf2e706396803f1738f54b7fd65723d39a0fcf (diff) | |
| download | android_external_rsync-1df395f7c211698420488a3f6600fd5cf50b7785.tar.gz android_external_rsync-1df395f7c211698420488a3f6600fd5cf50b7785.tar.bz2 android_external_rsync-1df395f7c211698420488a3f6600fd5cf50b7785.zip | |
Use the new HAVE_GETGROUPS define.
| -rw-r--r-- | getgroups.c | 4 | ||||
| -rw-r--r-- | uidlist.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/getgroups.c b/getgroups.c index 8dfe264c..8bb82f5d 100644 --- a/getgroups.c +++ b/getgroups.c @@ -39,10 +39,14 @@ main(UNUSED(int argc), UNUSED(char *argv[])) gid_t gid = MY_GID(); int gid_in_list = 0; +#ifdef HAVE_GETGROUPS if ((n = getgroups(NGROUPS_MAX, list)) < 0) { perror("getgroups"); return 1; } +#else + n = 0; +#endif for (i = 0; i < n; i++) { printf("%lu ", (unsigned long)list[i]); @@ -25,7 +25,10 @@ #include "rsync.h" -#ifdef GETGROUPS_T +#ifdef HAVE_GETGROUPS +# if !defined(GETGROUPS_T) +# define GETGROUPS_T gid_t +# endif # ifndef NGROUPS_MAX /* It ought to be defined, but just in case. */ # define NGROUPS_MAX 32 @@ -117,7 +120,7 @@ static uid_t match_uid(uid_t uid) static int is_in_group(gid_t gid) { -#ifdef GETGROUPS_T +#ifdef HAVE_GETGROUPS static gid_t last_in = GID_NONE, last_out; static int ngroups = -2; static GETGROUPS_T *gidset; |