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

diff --git a/uidlist.c b/uidlist.c
index b31b959e..2503d8a8 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2007 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
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,6 +35,7 @@ extern int verbose;
 extern int am_root;
 extern int preserve_uid;
 extern int preserve_gid;
+extern int preserve_acls;
 extern int numeric_ids;
 
 struct idlist {
@@ -189,7 +189,7 @@ static gid_t recv_add_gid(gid_t id, char *name)
 }
 
 /* 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;
@@ -210,7 +210,7 @@ static uid_t match_uid(uid_t uid)
 	return last_out = uid;
 }
 
-static gid_t match_gid(gid_t gid)
+gid_t match_gid(gid_t gid)
 {
 	static gid_t last_in = GID_NONE, last_out = GID_NONE;
 	struct idlist *list;
@@ -232,35 +232,39 @@ static gid_t match_gid(gid_t gid)
 }
 
 /* Add a uid to the list of uids.  Only called on sending side. */
-void add_uid(uid_t uid)
+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;
+			return NULL;
 	}
 
-	add_to_list(&uidlist, (int)uid, uid_to_name(uid), 0);
+	node = add_to_list(&uidlist, (int)uid, uid_to_name(uid), 0);
+	return node->name;
 }
 
 /* Add a gid to the list of gids.  Only called on sending side. */
-void add_gid(gid_t gid)
+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;
+			return NULL;
 	}
 
-	add_to_list(&gidlist, (int)gid, gid_to_name(gid), 0);
+	node = add_to_list(&gidlist, (int)gid, gid_to_name(gid), 0);
+	return node->name;
 }
 
 /* send a complete uid/gid mapping to the peer */
@@ -268,7 +272,7 @@ void send_uid_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) {
@@ -285,7 +289,7 @@ void send_uid_list(int f)
 		write_int(f, 0);
 	}
 
-	if (preserve_gid) {
+	if (preserve_gid || preserve_acls) {
 		int len;
 		for (list = gidlist; list; list = list->next) {
 			if (!list->name)
@@ -299,7 +303,7 @@ void send_uid_list(int f)
 	}
 }
 
-static uid_t recv_user_name(int f, uid_t uid)
+uid_t recv_user_name(int f, uid_t uid)
 {
 	int len = read_byte(f);
 	char *name = new_array(char, len+1);
@@ -309,7 +313,7 @@ static uid_t recv_user_name(int f, uid_t uid)
 	return recv_add_uid(uid, name); /* node keeps name's memory */
 }
 
-static gid_t recv_group_name(int f, gid_t gid)
+gid_t recv_group_name(int f, gid_t gid)
 {
 	int len = read_byte(f);
 	char *name = new_array(char, len+1);
@@ -325,25 +329,35 @@ void recv_uid_list(int f, struct file_list *flist)
 {
 	int id, i;
 
-	if (preserve_uid && !numeric_ids) {
+	if ((preserve_uid || preserve_acls) && !numeric_ids) {
 		/* read the uid list */
 		while ((id = read_int(f)) != 0)
 			recv_user_name(f, (uid_t)id);
 	}
 
-	if (preserve_gid && !numeric_ids) {
+	if ((preserve_gid || preserve_acls) && !numeric_ids) {
 		/* read the gid list */
 		while ((id = read_int(f)) != 0)
 			recv_group_name(f, (gid_t)id);
 	}
 
+#ifdef SUPPORT_ACLS
+	if (preserve_acls && !numeric_ids) {
+		id_t *id;
+		while ((id = next_acl_uid(flist)) != NULL)
+			*id = match_uid(*id);
+		while ((id = next_acl_gid(flist)) != NULL)
+			*id = match_gid(*id);
+	}
+#endif
+
 	/* 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++)
-			F_UID(flist->files[i]) = match_uid(F_UID(flist->files[i]));
+			F_OWNER(flist->files[i]) = match_uid(F_UID(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]));
+			F_GROUP(flist->files[i]) = match_gid(F_GID(flist->files[i]));
 	}
 }