X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/283887d7779e424a5f0a833f313df96a28f850bc..d3d07a5e860f1cde0e234ec7a1aff7111a2c514f:/uidlist.c

diff --git a/uidlist.c b/uidlist.c
index b31b959e..3d9c774e 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 /* If the source username/group does not exist on the target then use
@@ -25,6 +24,14 @@
  * are special. */
 
 #include "rsync.h"
+#include "io.h"
+
+extern int verbose;
+extern int am_root;
+extern int preserve_uid;
+extern int preserve_gid;
+extern int preserve_acls;
+extern int numeric_ids;
 
 #ifdef HAVE_GETGROUPS
 # ifndef GETGROUPS_T
@@ -32,23 +39,20 @@
 # endif
 #endif
 
-extern int verbose;
-extern int am_root;
-extern int preserve_uid;
-extern int preserve_gid;
-extern int numeric_ids;
+#define GID_NONE ((gid_t)-1)
 
 struct idlist {
 	struct idlist *next;
-	int id, id2;
-	char *name;
+	const char *name;
+	id_t id, id2;
+	uint16 flags;
 };
 
 static struct idlist *uidlist;
 static struct idlist *gidlist;
 
-static struct idlist *add_to_list(struct idlist **root, int id, char *name,
-				  int id2)
+static struct idlist *add_to_list(struct idlist **root, id_t id, const char *name,
+				  id_t id2, uint16 flags)
 {
 	struct idlist *node = new(struct idlist);
 	if (!node)
@@ -57,12 +61,13 @@ static struct idlist *add_to_list(struct idlist **root, int id, char *name,
 	node->name = name;
 	node->id = id;
 	node->id2 = id2;
+	node->flags = flags;
 	*root = node;
 	return node;
 }
 
 /* turn a uid into a user name */
-static char *uid_to_name(uid_t uid)
+static const char *uid_to_name(uid_t uid)
 {
 	struct passwd *pass = getpwuid(uid);
 	if (pass)
@@ -71,7 +76,7 @@ static char *uid_to_name(uid_t uid)
 }
 
 /* turn a gid into a group name */
-static char *gid_to_name(gid_t gid)
+static const char *gid_to_name(gid_t gid)
 {
 	struct group *grp = getgrgid(gid);
 	if (grp)
@@ -79,7 +84,7 @@ static char *gid_to_name(gid_t gid)
 	return NULL;
 }
 
-static uid_t map_uid(uid_t id, char *name)
+static uid_t map_uid(uid_t id, const char *name)
 {
 	uid_t uid;
 	if (id != 0 && name_to_uid(name, &uid))
@@ -87,7 +92,7 @@ static uid_t map_uid(uid_t id, char *name)
 	return id;
 }
 
-static gid_t map_gid(gid_t id, char *name)
+static gid_t map_gid(gid_t id, const char *name)
 {
 	gid_t gid;
 	if (id != 0 && name_to_gid(name, &gid))
@@ -148,48 +153,47 @@ static int is_in_group(gid_t gid)
 	if (mygid == GID_NONE) {
 		mygid = MY_GID();
 		if (verbose > 3)
-			rprintf(FINFO, "process has gid %d\n", (int)mygid);
+			rprintf(FINFO, "process has gid %u\n", (unsigned)mygid);
 	}
 	return gid == mygid;
 #endif
 }
 
 /* Add a uid to the list of uids.  Only called on receiving side. */
-static uid_t recv_add_uid(uid_t id, char *name)
+static struct idlist *recv_add_uid(uid_t id, const char *name)
 {
 	uid_t id2 = name ? map_uid(id, name) : id;
 	struct idlist *node;
 
-	node = add_to_list(&uidlist, (int)id, name, (int)id2);
+	node = add_to_list(&uidlist, id, name, id2, 0);
 
 	if (verbose > 3) {
-		rprintf(FINFO, "uid %d(%s) maps to %d\n",
-			(int)id, name ? name : "", (int)id2);
+		rprintf(FINFO, "uid %u(%s) maps to %u\n",
+			(unsigned)id, name ? name : "", (unsigned)id2);
 	}
 
-	return id2;
+	return node;
 }
 
 /* Add a gid to the list of gids.  Only called on receiving side. */
-static gid_t recv_add_gid(gid_t id, char *name)
+static struct idlist *recv_add_gid(gid_t id, const char *name)
 {
 	gid_t id2 = name ? map_gid(id, name) : id;
 	struct idlist *node;
 
-	if (!am_root && !is_in_group(id2))
-		id2 = GID_NONE;
-	node = add_to_list(&gidlist, (int)id, name, (int)id2);
+	node = add_to_list(&gidlist, id, name, id2,
+		!am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0);
 
 	if (verbose > 3) {
-		rprintf(FINFO, "gid %d(%s) maps to %d\n",
-			(int)id, name ? name : "", (int)id2);
+		rprintf(FINFO, "gid %u(%s) maps to %u\n",
+			(unsigned)id, name ? name : "", (unsigned)id2);
 	}
 
-	return id2;
+	return node;
 }
 
 /* this function is a definate candidate for a faster algorithm */
-static uid_t match_uid(uid_t uid)
+uid_t match_uid(uid_t uid)
 {
 	static uid_t last_in, last_out;
 	struct idlist *list;
@@ -203,147 +207,173 @@ static uid_t match_uid(uid_t uid)
 	last_in = uid;
 
 	for (list = uidlist; list; list = list->next) {
-		if (list->id == (int)uid)
-			return last_out = (uid_t)list->id2;
+		if (list->id == uid)
+			return last_out = list->id2;
 	}
 
 	return last_out = uid;
 }
 
-static gid_t match_gid(gid_t gid)
+gid_t match_gid(gid_t gid, uint16 *flags_ptr)
 {
-	static gid_t last_in = GID_NONE, last_out = GID_NONE;
+	static struct idlist *last = NULL;
 	struct idlist *list;
 
-	if (gid == GID_NONE)
-		return GID_NONE;
-
-	if (gid == last_in)
-		return last_out;
-
-	last_in = gid;
-
-	for (list = gidlist; list; list = list->next) {
-		if (list->id == (int)gid)
-			return last_out = (gid_t)list->id2;
+	if (last && gid == last->id)
+		list = last;
+	else {
+		for (list = gidlist; list; list = list->next) {
+			if (list->id == gid)
+				break;
+		}
+		if (!list)
+			list = recv_add_gid(gid, NULL);
+		last = list;
 	}
 
-	return last_out = recv_add_gid(gid, NULL);
+	if (flags_ptr && list->flags & FLAG_SKIP_GROUP)
+		*flags_ptr |= FLAG_SKIP_GROUP;
+	return list->id2;
 }
 
 /* Add a uid to the list of uids.  Only called on sending side. */
-void add_uid(uid_t uid)
+const char *add_uid(uid_t uid)
 {
 	struct idlist *list;
+	struct idlist *node;
 
 	if (uid == 0)	/* don't map root */
-		return;
+		return NULL;
 
 	for (list = uidlist; list; list = list->next) {
-		if (list->id == (int)uid)
-			return;
+		if (list->id == uid)
+			return NULL;
 	}
 
-	add_to_list(&uidlist, (int)uid, uid_to_name(uid), 0);
+	node = add_to_list(&uidlist, uid, uid_to_name(uid), 0, 0);
+	return node->name;
 }
 
 /* Add a gid to the list of gids.  Only called on sending side. */
-void add_gid(gid_t gid)
+const char *add_gid(gid_t gid)
 {
 	struct idlist *list;
+	struct idlist *node;
 
 	if (gid == 0)	/* don't map root */
-		return;
+		return NULL;
 
 	for (list = gidlist; list; list = list->next) {
-		if (list->id == (int)gid)
-			return;
+		if (list->id == gid)
+			return NULL;
 	}
 
-	add_to_list(&gidlist, (int)gid, gid_to_name(gid), 0);
+	node = add_to_list(&gidlist, gid, gid_to_name(gid), 0, 0);
+	return node->name;
 }
 
 /* send a complete uid/gid mapping to the peer */
-void send_uid_list(int f)
+void send_id_list(int f)
 {
 	struct idlist *list;
 
-	if (preserve_uid) {
+	if (preserve_uid || preserve_acls) {
 		int len;
 		/* we send sequences of uid/byte-length/name */
 		for (list = uidlist; list; list = list->next) {
 			if (!list->name)
 				continue;
 			len = strlen(list->name);
-			write_int(f, list->id);
+			write_varint30(f, list->id);
 			write_byte(f, len);
 			write_buf(f, list->name, len);
 		}
 
 		/* terminate the uid list with a 0 uid. We explicitly exclude
 		 * 0 from the list */
-		write_int(f, 0);
+		write_varint30(f, 0);
 	}
 
-	if (preserve_gid) {
+	if (preserve_gid || preserve_acls) {
 		int len;
 		for (list = gidlist; list; list = list->next) {
 			if (!list->name)
 				continue;
 			len = strlen(list->name);
-			write_int(f, list->id);
+			write_varint30(f, list->id);
 			write_byte(f, len);
 			write_buf(f, list->name, len);
 		}
-		write_int(f, 0);
+		write_varint30(f, 0);
 	}
 }
 
-static uid_t recv_user_name(int f, uid_t uid)
+uid_t recv_user_name(int f, uid_t uid)
 {
+	struct idlist *node;
 	int len = read_byte(f);
 	char *name = new_array(char, len+1);
 	if (!name)
 		out_of_memory("recv_user_name");
 	read_sbuf(f, name, len);
-	return recv_add_uid(uid, name); /* node keeps name's memory */
+	if (numeric_ids < 0) {
+		free(name);
+		name = NULL;
+	}
+	node = recv_add_uid(uid, name); /* node keeps name's memory */
+	return node->id2;
 }
 
-static gid_t recv_group_name(int f, gid_t gid)
+gid_t recv_group_name(int f, gid_t gid, uint16 *flags_ptr)
 {
+	struct idlist *node;
 	int len = read_byte(f);
 	char *name = new_array(char, len+1);
 	if (!name)
 		out_of_memory("recv_group_name");
 	read_sbuf(f, name, len);
-	return recv_add_gid(gid, name); /* node keeps name's memory */
+	if (numeric_ids < 0) {
+		free(name);
+		name = NULL;
+	}
+	node = recv_add_gid(gid, name); /* node keeps name's memory */
+	if (flags_ptr && node->flags & FLAG_SKIP_GROUP)
+		*flags_ptr |= FLAG_SKIP_GROUP;
+	return node->id2;
 }
 
 /* recv a complete uid/gid mapping from the peer and map the uid/gid
  * in the file list to local names */
-void recv_uid_list(int f, struct file_list *flist)
+void recv_id_list(int f, struct file_list *flist)
 {
-	int id, i;
+	id_t id;
+	int i;
 
-	if (preserve_uid && !numeric_ids) {
+	if ((preserve_uid || preserve_acls) && numeric_ids <= 0) {
 		/* read the uid list */
-		while ((id = read_int(f)) != 0)
-			recv_user_name(f, (uid_t)id);
+		while ((id = read_varint30(f)) != 0)
+			recv_user_name(f, id);
 	}
 
-	if (preserve_gid && !numeric_ids) {
+	if ((preserve_gid || preserve_acls) && numeric_ids <= 0) {
 		/* read the gid list */
-		while ((id = read_int(f)) != 0)
-			recv_group_name(f, (gid_t)id);
+		while ((id = read_varint30(f)) != 0)
+			recv_group_name(f, id, NULL);
 	}
 
 	/* Now convert all the uids/gids from sender values to our values. */
+#ifdef SUPPORT_ACLS
+	if (preserve_acls && !numeric_ids)
+		match_acl_ids();
+#endif
 	if (am_root && preserve_uid && !numeric_ids) {
-		for (i = 0; i < flist->count; i++)
-			F_UID(flist->files[i]) = match_uid(F_UID(flist->files[i]));
+		for (i = 0; i < flist->used; i++)
+			F_OWNER(flist->files[i]) = match_uid(F_OWNER(flist->files[i]));
 	}
 	if (preserve_gid && (!am_root || !numeric_ids)) {
-		for (i = 0; i < flist->count; i++)
-			F_GID(flist->files[i]) = match_gid(F_GID(flist->files[i]));
+		for (i = 0; i < flist->used; i++) {
+			F_GROUP(flist->files[i]) = match_gid(F_GROUP(flist->files[i]),
+							     &flist->files[i]->flags);
+		}
 	}
 }