If a gid doesn't have a name on the originating system, the receiver

[rsync/rsync.git] / uidlist.c

diff --git a/uidlist.c b/uidlist.c
index e9ab35d..c3322db 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -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;
@@ -126,11 +129,9 @@ static int is_in_group(gid_t gid)
        if (gid == last_in)
                return last_out;
        if (ngroups < -1) {
-               gid_t mygid = getgid();
-               ngroups = getgroups(0, 0);
-               /* If that didn't work, perhaps 0 isn't treated specially? */
-               if (ngroups <= 0)
-                       ngroups = NGROUPS_MAX;
+               gid_t mygid = MY_GID();
+               if ((ngroups = getgroups(0, 0)) < 0)
+                       ngroups = 0;
                gidset = new_array(GETGROUPS_T, ngroups+1);
                if (ngroups > 0)
                        ngroups = getgroups(ngroups, gidset);
@@ -142,10 +143,16 @@ static int is_in_group(gid_t gid)
                if (n == ngroups)
                        gidset[ngroups++] = mygid;
                if (verbose > 3) {
+                       char gidbuf[NGROUPS_MAX*16+32];
+                       int pos;
+                       sprintf(gidbuf, "process has %d gid%s: ",
+                           ngroups, ngroups == 1? "" : "s");
+                       pos = strlen(gidbuf);
                        for (n = 0; n < ngroups; n++) {
-                               rprintf(FINFO, "process has gid %ld\n",
-                                   (long)gidset[n]);
+                               sprintf(gidbuf+pos, " %ld", (long)gidset[n]);
+                               pos += strlen(gidbuf+pos);
                        }
+                       rprintf(FINFO, "%s\n", gidbuf);
                }
        }
 
@@ -158,8 +165,11 @@ static int is_in_group(gid_t gid)
 
 #else
        static gid_t mygid = GID_NONE;
-       if (mygid == GID_NONE)
-               mygid = getgid();
+       if (mygid == GID_NONE) {
+               mygid = MY_GID();
+               if (verbose > 3)
+                       rprintf(FINFO, "process has gid %ld\n", (long)mygid);
+       }
        return gid == mygid;
 #endif
 }
@@ -182,7 +192,7 @@ static gid_t match_gid(gid_t gid)
                list = list->next;
        }
        
-       if (am_root)
+       if (am_root || is_in_group(gid))
                last_out = gid;
        else
                last_out = GID_NONE;