X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ba2133d6add082b059728074febdac6c520a4351..d858b27400eba6301a25d5cb34330e7748bcf772:/uidlist.c

diff --git a/uidlist.c b/uidlist.c
index 9c74bfef..72bff3c6 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -24,6 +24,7 @@
  * are special. */
 
 #include "rsync.h"
+#include "io.h"
 
 #ifdef HAVE_GETGROUPS
 # ifndef GETGROUPS_T
@@ -35,6 +36,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 {
@@ -271,34 +273,34 @@ 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) {
 			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);
 	}
 }
 
@@ -328,19 +330,23 @@ 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)
+		while ((id = read_varint30(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)
+		while ((id = read_varint30(f)) != 0)
 			recv_group_name(f, (gid_t)id);
 	}
 
 	/* 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_OWNER(flist->files[i]) = match_uid(F_UID(flist->files[i]));