Output some debug info if verbose > 3.

[rsync/rsync.git] / uidlist.c

diff --git a/uidlist.c b/uidlist.c
index 896e16c..c520df3 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -32,6 +32,7 @@
 # endif
 #endif
 
+extern int verbose;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int numeric_ids;
@@ -97,7 +98,8 @@ static uid_t match_uid(uid_t uid)
        static uid_t last_in, last_out;
        struct idlist *list = uidlist;
 
-       if (uid == last_in) return last_out;
+       if (uid == last_in)
+               return last_out;
 
        last_in = uid;
 
@@ -116,7 +118,7 @@ static uid_t match_uid(uid_t uid)
 static int is_in_group(gid_t gid)
 {
 #ifdef GETGROUPS_T
-       static gid_t last_in = (gid_t) -2, last_out;
+       static gid_t last_in = GID_NONE, last_out;
        static int ngroups = -2;
        static GETGROUPS_T *gidset;
        int n;
@@ -127,7 +129,7 @@ static int is_in_group(gid_t gid)
                gid_t mygid = getgid();
                ngroups = getgroups(0, 0);
                /* If that didn't work, perhaps 0 isn't treated specially? */
-               if (ngroups < 0)
+               if (ngroups <= 0)
                        ngroups = NGROUPS_MAX;
                gidset = new_array(GETGROUPS_T, ngroups+1);
                if (ngroups > 0)
@@ -139,29 +141,36 @@ static int is_in_group(gid_t gid)
                }
                if (n == ngroups)
                        gidset[ngroups++] = mygid;
+               if (verbose > 3) {
+                       for (n = 0; n < ngroups; n++) {
+                               rprintf(FINFO, "process gid %d: %ld\n",
+                                   n, (long)gidset[n]);
+                       }
+               }
        }
 
        last_in = gid;
-       last_out = 0;
        for (n = 0; n < ngroups; n++) {
-               if (gidset[n] == gid) {
-                       last_out = 1;
-                       break;
-               }
+               if (gidset[n] == gid)
+                       return last_out = 1;
        }
-       return last_out;
+       return last_out = 0;
 
 #else
-       return 0;
+       static gid_t mygid = GID_NONE;
+       if (mygid == GID_NONE)
+               mygid = getgid();
+       return gid == mygid;
 #endif
 }
 
 static gid_t match_gid(gid_t gid)
 {
-       static gid_t last_in, last_out;
+       static gid_t last_in = GID_NONE, last_out = GID_NONE;
        struct idlist *list = gidlist;
 
-       if (gid == last_in) return last_out;
+       if (gid == last_in)
+               return last_out;
 
        last_in = gid;
 
@@ -258,7 +267,7 @@ void send_uid_list(int f)
                }
 
                /* terminate the uid list with a 0 uid. We explicitly exclude
-                  0 from the list */
+                * 0 from the list */
                write_int(f, 0);
        }
 
@@ -276,7 +285,7 @@ void send_uid_list(int f)
 }
 
 /* recv a complete uid/gid mapping from the peer and map the uid/gid
-   in the file list to local names */
+ * in the file list to local names */
 void recv_uid_list(int f, struct file_list *flist)
 {
        int id, i;
@@ -303,6 +312,13 @@ void recv_uid_list(int f, struct file_list *flist)
                        list->id2 = map_uid(id, name);
                        free(name);
                }
+               if (verbose > 3) {
+                       for (list = uidlist; list; list = list->next) {
+                               rprintf(FINFO, "uid %s (%ld) maps to %ld\n",
+                                   list->name, (long)list->id,
+                                   (long)list->id2);
+                       }
+               }
        }
 
 
@@ -326,12 +342,19 @@ void recv_uid_list(int f, struct file_list *flist)
                                list->id2 = GID_NONE;
                        free(name);
                }
+               if (verbose > 3) {
+                       for (list = gidlist; list; list = list->next) {
+                               rprintf(FINFO, "gid %s (%ld) maps to %ld\n",
+                                   list->name, (long)list->id,
+                                   (long)list->id2);
+                       }
+               }
        }
 
        if (!(am_root && preserve_uid) && !preserve_gid) return;
 
        /* now convert the uid/gid of all files in the list to the mapped
-          uid/gid */
+        * uid/gid */
        for (i = 0; i < flist->count; i++) {
                if (am_root && preserve_uid && flist->files[i]->uid != 0)
                        flist->files[i]->uid = match_uid(flist->files[i]->uid);