X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b3bf9b9df95137a3a43248be9599d919b04877af..0cdb547f5c79506686a67da65edd3ae0b3c581c1:/uidlist.c

diff --git a/uidlist.c b/uidlist.c
index 7162dfa6..0122f353 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -179,22 +179,22 @@ static struct idlist *recv_add_id(struct idlist **idlist_ptr, struct idlist *idm
 	if (node)
 		id2 = node->id2;
 	else if (*name && id) {
-		if (idmap == uidmap) {
+		if (idlist_ptr == &uidlist) {
 			uid_t uid;
-			id2 = name_to_uid(name, &uid) ? uid : id;
+			id2 = user_to_uid(name, &uid, False) ? uid : id;
 		} else {
 			gid_t gid;
-			id2 = name_to_gid(name, &gid) ? gid : id;
+			id2 = group_to_gid(name, &gid, False) ? gid : id;
 		}
 	} else
 		id2 = id;
 
-	flag = idmap == gidmap && !am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0;
+	flag = idlist_ptr == &gidlist && !am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0;
 	node = add_to_list(idlist_ptr, id, *name ? name : NULL, id2, flag);
 
 	if (DEBUG_GTE(OWN, 2)) {
 		rprintf(FINFO, "%sid %u(%s) maps to %u\n",
-			idmap == uidmap ? "u" : "g",
+			idlist_ptr == &uidlist ? "u" : "g",
 			(unsigned)id, name, (unsigned)id2);
 	}
 
@@ -415,7 +415,6 @@ void parse_name_map(char *map, BOOL usernames)
 			char *dash = strchr(cp, '-');
 			if (strspn(cp, "0123456789-") != (size_t)(colon - cp)
 			 || (dash && (!dash[1] || strchr(dash+1, '-')))) {
-			  bad_number:
 				rprintf(FERROR, "Invalid number in --%smap: %s\n",
 					usernames ? "user" : "group", cp);
 				exit_cleanup(RERR_SYNTAX);
@@ -436,15 +435,9 @@ void parse_name_map(char *map, BOOL usernames)
 			id1 = 0;
 		}
 
-		if (isDigit(colon+1)) {
-			if (strspn(colon+1, "0123456789") != (size_t)(end - colon - 1)) {
-				cp = colon+1;
-				goto bad_number;
-			}
-			add_to_list(idmap_ptr, id1, name, atol(colon+1), flags);
-		} else if (usernames) {
+		if (usernames) {
 			uid_t uid;
-			if (name_to_uid(colon+1, &uid))
+			if (user_to_uid(colon+1, &uid, True))
 				add_to_list(idmap_ptr, id1, name, uid, flags);
 			else {
 				rprintf(FERROR,
@@ -453,7 +446,7 @@ void parse_name_map(char *map, BOOL usernames)
 			}
 		} else {
 			gid_t gid;
-			if (name_to_gid(colon+1, &gid))
+			if (group_to_gid(colon+1, &gid, True))
 				add_to_list(idmap_ptr, id1, name, gid, flags);
 			else {
 				rprintf(FERROR,