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

diff --git a/uidlist.c b/uidlist.c
index 32351a29..72bff3c6 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -280,14 +280,14 @@ void send_uid_list(int f)
 			if (!list->name)
 				continue;
 			len = strlen(list->name);
-			write_abbrevint30(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_abbrevint30(f, 0);
+		write_varint30(f, 0);
 	}
 
 	if (preserve_gid || preserve_acls) {
@@ -296,11 +296,11 @@ void send_uid_list(int f)
 			if (!list->name)
 				continue;
 			len = strlen(list->name);
-			write_abbrevint30(f, list->id);
+			write_varint30(f, list->id);
 			write_byte(f, len);
 			write_buf(f, list->name, len);
 		}
-		write_abbrevint30(f, 0);
+		write_varint30(f, 0);
 	}
 }
 
@@ -332,27 +332,21 @@ void recv_uid_list(int f, struct file_list *flist)
 
 	if ((preserve_uid || preserve_acls) && !numeric_ids) {
 		/* read the uid list */
-		while ((id = read_abbrevint30(f)) != 0)
+		while ((id = read_varint30(f)) != 0)
 			recv_user_name(f, (uid_t)id);
 	}
 
 	if ((preserve_gid || preserve_acls) && !numeric_ids) {
 		/* read the gid list */
-		while ((id = read_abbrevint30(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) {
-		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);
-	}
+	if (preserve_acls && !numeric_ids)
+		match_acl_ids();
 #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_OWNER(flist->files[i]) = match_uid(F_UID(flist->files[i]));