X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/764782662d8049bf835cad0e643be6ee6ed7280c..a217c4535951943e00d6dd991cc6f775034ca4a9:/uidlist.c

diff --git a/uidlist.c b/uidlist.c
index 32351a29..47c5abac 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -342,17 +342,11 @@ void recv_uid_list(int f, struct file_list *flist)
 			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]));