X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d49def483253155f969ad04f32752196b00faa96..d051056f921f465c487a85f9fa29a2324332bc4b:/uidlist.c

diff --git a/uidlist.c b/uidlist.c
index 4daa5666..1747c836 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -26,13 +26,9 @@
 #include "rsync.h"
 
 #ifdef HAVE_GETGROUPS
-# if !defined(GETGROUPS_T)
+# ifndef GETGROUPS_T
 #  define GETGROUPS_T gid_t
 # endif
-# ifndef NGROUPS_MAX
-/* It ought to be defined, but just in case. */
-#  define NGROUPS_MAX 32
-# endif
 #endif
 
 extern int verbose;
@@ -85,7 +81,7 @@ static char *gid_to_name(gid_t gid)
 static int map_uid(int id, char *name)
 {
 	uid_t uid;
-	if (uid != 0 && name_to_uid(name, &uid))
+	if (id != 0 && name_to_uid(name, &uid))
 		return uid;
 	return id;
 }
@@ -93,7 +89,7 @@ static int map_uid(int id, char *name)
 static int map_gid(int id, char *name)
 {
 	gid_t gid;
-	if (gid != 0 && name_to_gid(name, &gid))
+	if (id != 0 && name_to_gid(name, &gid))
 		return gid;
 	return id;
 }
@@ -110,9 +106,11 @@ static int is_in_group(gid_t gid)
 		return last_out;
 	if (ngroups < -1) {
 		gid_t mygid = MY_GID();
-		if ((ngroups = getgroups(0, 0)) < 0)
+		if ((ngroups = getgroups(0, NULL)) < 0)
 			ngroups = 0;
 		gidset = new_array(GETGROUPS_T, ngroups+1);
+		if (!gidset)
+			out_of_memory("is_in_group");
 		if (ngroups > 0)
 			ngroups = getgroups(ngroups, gidset);
 		/* The default gid might not be in the list on some systems. */
@@ -123,8 +121,10 @@ 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;
+			char *gidbuf = new_array(char, ngroups*21+32);
+			if (!gidbuf)
+				out_of_memory("is_in_group");
 			sprintf(gidbuf, "process has %d gid%s: ",
 			    ngroups, ngroups == 1? "" : "s");
 			pos = strlen(gidbuf);
@@ -133,6 +133,7 @@ static int is_in_group(gid_t gid)
 				pos += strlen(gidbuf+pos);
 			}
 			rprintf(FINFO, "%s\n", gidbuf);
+			free(gidbuf);
 		}
 	}
 
@@ -160,7 +161,7 @@ static struct idlist *recv_add_uid(int id, char *name)
 	int id2 = name ? map_uid(id, name) : id;
 	struct idlist *node;
 
-	node = add_to_list(&uidlist, id, name, map_uid(id, name));
+	node = add_to_list(&uidlist, id, name, id2);
 
 	if (verbose > 3) {
 		rprintf(FINFO, "uid %d(%s) maps to %d\n",
@@ -215,8 +216,8 @@ static gid_t match_gid(gid_t gid)
 	static gid_t last_in = GID_NONE, last_out = GID_NONE;
 	struct idlist *list;
 
-	if (gid == 0)
-		return 0;
+	if (gid == GID_NONE)
+		return GID_NONE;
 
 	if (gid == last_in)
 		return last_out;
@@ -323,7 +324,6 @@ void recv_uid_list(int f, struct file_list *flist)
 		}
 	}
 
-
 	if (preserve_gid && !numeric_ids) {
 		/* read the gid list */
 		while ((id = read_int(f)) != 0) {
@@ -336,8 +336,7 @@ void recv_uid_list(int f, struct file_list *flist)
 		}
 	}
 
-	/* now convert the uid/gid of all files in the list to the mapped
-	 * uid/gid */
+	/* Now convert all the uids/gids from sender values to our values. */
 	if (am_root && preserve_uid && !numeric_ids) {
 		for (i = 0; i < flist->count; i++)
 			flist->files[i]->uid = match_uid(flist->files[i]->uid);