extern struct stats stats;
extern char curr_dir[MAXPATHLEN];
-@@ -741,7 +743,7 @@ static struct file_struct *recv_file_ent
+@@ -745,7 +747,7 @@ static struct file_struct *recv_file_ent
uid = (uid_t)read_varint(f);
- if (flags & XMIT_USER_NAME_FOLLOWS)
+ if (xflags & XMIT_USER_NAME_FOLLOWS)
uid = recv_user_name(f, uid);
- else if (inc_recurse && am_root && !numeric_ids)
+ else if (inc_recurse && am_root && (!numeric_ids || usermap))
uid = match_uid(uid);
}
}
-@@ -752,7 +754,7 @@ static struct file_struct *recv_file_ent
- gid = (gid_t)read_varint(f);
- if (flags & XMIT_GROUP_NAME_FOLLOWS)
- gid = recv_group_name(f, gid);
+@@ -757,7 +759,7 @@ static struct file_struct *recv_file_ent
+ gid_flags = 0;
+ if (xflags & XMIT_GROUP_NAME_FOLLOWS)
+ gid = recv_group_name(f, gid, &gid_flags);
- else if (inc_recurse && (!am_root || !numeric_ids))
+ else if (inc_recurse && (!am_root || !numeric_ids || groupmap))
- gid = match_gid(gid);
+ gid = match_gid(gid, &gid_flags);
}
}
-@@ -1882,8 +1884,13 @@ struct file_list *recv_file_list(int f)
+@@ -1935,8 +1937,13 @@ struct file_list *recv_file_list(int f)
int dstart, flags;
int64 start_read;
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
rprintf(F," --size-only skip files that match in size\n");
-@@ -568,6 +572,8 @@ static struct poptOption long_options[]
- {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
- {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
- {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
+@@ -581,6 +585,8 @@ static struct poptOption long_options[]
+ {"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
+ {"numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 1, 0, 0 },
+ {"no-numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 0, 0, 0 },
+ {"usermap", 0, POPT_ARG_STRING, &usermap, 0, 0, 0 },
+ {"groupmap", 0, POPT_ARG_STRING, &groupmap, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
+ {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 },
{"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
- {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
-@@ -1857,6 +1863,18 @@ void server_options(char **args,int *arg
+@@ -1875,6 +1881,18 @@ void server_options(char **args,int *arg
args[ac++] = "--numeric-ids";
if (am_sender) {
--- old/rsync.yo
+++ new/rsync.yo
-@@ -361,6 +361,8 @@ to the detailed description below for a
+@@ -367,6 +367,8 @@ to the detailed description below for a
--delay-updates put all updated files into place at end
-m, --prune-empty-dirs prune empty directory chains from file-list
--numeric-ids don't map uid/gid values by user/group name
--timeout=TIME set I/O timeout in seconds
-I, --ignore-times don't skip files that match size and time
--size-only skip files that match in size
-@@ -1445,6 +1447,42 @@ from the source system is used instead.
+@@ -1451,6 +1453,46 @@ from the source system is used instead.
the chroot setting affects rsync's ability to look up the names of the
users and groups and what you can do about it.
+mappings you need separated by commas to a single bf(--usermap) option,
+and likewise for groups with the bf(--groupmap) option.
+
-+Note that the sender's name for the 0 uid/gid is not actually transmitted
++Note that the sender's name for the 0 user and group are not transmitted
+to the receiver, so you should either match these values using a 0, or use
+the names in effect on the receiving side. All other bf(FROM) names match
-+those in use on sending side. All bf(TO) names match those in use on the
-+receiving side.
++those in use on the sending side. All bf(TO) names match those in use on
++the receiving side.
+
-+If the bf(--numeric-ids) option is used, you must specify numeric bf(FROM)
-+values for them to be effective, since the sender does not send any names
-+when this option is used, and wild-card rules don't match nameless ID
-+values. The only exceptions to this are (1) the names for the 0 uid/gid,
-+which are always supplied by the receiving side, and (2) a "*", which
-+matches even an empty name.
++Any IDs that do not have name on the sending side are treaded as having an
++empty name for the purpose of matching. This allows them to be matched via
++a "*" as well as an empty name mapping. For instance:
++
++verb( --usermap=:nobody --groupmap=*:nobody)
++
++When the bf(--numeric-ids) option is used,the sender does not send any
++names, so all the IDs are treaded as having an empty name. This means that
++you will need to specify numeric bf(FROM) values if you want to map these
++nameless IDs to different values.
+
+For the bf(--usermap) option to have any effect, the bf(-o) (bf(--owner))
+option must be used (or implied), and the receiver will need to be running
-+as root (see also the bf(--fake-super) option). For the bf(--groupmap)
++as a super-user (see also the bf(--fake-super) option). For the bf(--groupmap)
+option to have any effect, the bf(-g) (bf(--groups)) option must be used
+(or implied), and the receiver will need to have permissions to set that
+group.
then rsync will exit. The default is 0, which means no timeout.
--- old/uidlist.c
+++ new/uidlist.c
-@@ -38,6 +38,8 @@ extern int preserve_uid;
+@@ -31,6 +31,8 @@ extern int preserve_uid;
extern int preserve_gid;
extern int preserve_acls;
extern int numeric_ids;
+extern char *usermap;
+extern char *groupmap;
+ #ifdef HAVE_GETGROUPS
+ # ifndef GETGROUPS_T
+@@ -40,6 +42,9 @@ extern int numeric_ids;
+
+ #define GID_NONE ((gid_t)-1)
+
++#define NFLAGS_WILD_NAME_MATCH (1<<0)
++#define NFLAGS_NAME_MATCH (1<<1)
++
struct idlist {
struct idlist *next;
-@@ -45,8 +47,8 @@ struct idlist {
char *name;
+@@ -47,8 +52,8 @@ struct idlist {
+ uint16 flags;
};
-static struct idlist *uidlist;
+static struct idlist *uidlist, *uidmap;
+static struct idlist *gidlist, *gidmap;
- static struct idlist *add_to_list(struct idlist **root, int id, char *name,
- int id2)
-@@ -158,14 +160,41 @@ static int is_in_group(gid_t gid)
- /* Add a uid to the list of uids. Only called on receiving side. */
- static uid_t recv_add_uid(uid_t id, char *name)
+ static struct idlist *add_to_list(struct idlist **root, id_t id, char *name,
+ id_t id2, uint16 flags)
+@@ -83,22 +88,6 @@ static char *gid_to_name(gid_t gid)
+ return NULL;
+ }
+
+-static uid_t map_uid(uid_t id, char *name)
+-{
+- uid_t uid;
+- if (id != 0 && name_to_uid(name, &uid))
+- return uid;
+- return id;
+-}
+-
+-static gid_t map_gid(gid_t id, char *name)
+-{
+- gid_t gid;
+- if (id != 0 && name_to_gid(name, &gid))
+- return gid;
+- return id;
+-}
+-
+ static int is_in_group(gid_t gid)
+ {
+ #ifdef HAVE_GETGROUPS
+@@ -158,34 +147,49 @@ static int is_in_group(gid_t gid)
+ #endif
+ }
+
+-/* Add a uid to the list of uids. Only called on receiving side. */
+-static struct idlist *recv_add_uid(uid_t id, char *name)
++/* Add a uid/gid to its list of ids. Only called on receiving side. */
++static struct idlist *recv_add_id(struct idlist **idmap_ptr, id_t id, char *name)
{
- uid_t id2 = name ? map_uid(id, name) : id;
struct idlist *node;
-+ uid_t id2;
++ id_t id2;
-- node = add_to_list(&uidlist, (int)id, name, (int)id2);
+- node = add_to_list(&uidlist, id, name, id2, 0);
+ if (!name)
+ name = "";
-+
-+ for (node = uidmap; node; node = node->next) {
-+ switch (node->id) {
-+ case -2:
-+ if (!wildmatch(node->name, name))
-+ continue;
-+ break;
-+ case -1:
-+ if (strcmp(node->name, name) != 0)
-+ continue;
-+ break;
-+ default:
-+ if (node->id != (int)id)
-+ continue;
-+ break;
-+ }
-+ break;
-+ }
-+ if (node)
-+ id2 = node->id2;
-+ else if (*name && id)
-+ id2 = map_uid(id, name);
-+ else
-+ id2 = id;
-+
-+ node = add_to_list(&uidlist, (int)id, *name ? name : NULL, (int)id2);
-
- if (verbose > 3) {
- rprintf(FINFO, "uid %d(%s) maps to %d\n",
-- (int)id, name ? name : "", (int)id2);
-+ (int)id, name, (int)id2);
- }
- return id2;
-@@ -174,16 +203,43 @@ static uid_t recv_add_uid(uid_t id, char
- /* Add a gid to the list of gids. Only called on receiving side. */
- static gid_t recv_add_gid(gid_t id, char *name)
- {
-- gid_t id2 = name ? map_gid(id, name) : id;
- struct idlist *node;
-+ gid_t id2;
-+
-+ if (!name)
-+ name = "";
-+
-+ for (node = gidmap; node; node = node->next) {
-+ switch (node->id) {
-+ case -2:
+- if (verbose > 3) {
+- rprintf(FINFO, "uid %u(%s) maps to %u\n",
+- (unsigned)id, name ? name : "", (unsigned)id2);
++ for (node = *idmap_ptr; node; node = node->next) {
++ if (node->flags & NFLAGS_WILD_NAME_MATCH) {
+ if (!wildmatch(node->name, name))
+ continue;
-+ break;
-+ case -1:
++ } else if (node->flags & NFLAGS_NAME_MATCH) {
+ if (strcmp(node->name, name) != 0)
+ continue;
-+ break;
-+ default:
-+ if (node->id != (int)id)
++ } else {
++ if (node->id != id)
+ continue;
-+ break;
+ }
+ break;
-+ }
+ }
+ if (node)
+ id2 = node->id2;
-+ else if (*name && id)
-+ id2 = map_gid(id, name);
-+ else
++ else if (*name && id) {
++ if (idmap_ptr == &uidmap) {
++ uid_t uid;
++ id2 = name_to_uid(name, &uid) ? uid : id;
++ } else {
++ gid_t gid;
++ id2 = name_to_gid(name, &gid) ? gid : id;
++ }
++ } else
+ id2 = id;
- if (!am_root && !is_in_group(id2))
- id2 = GID_NONE;
-- node = add_to_list(&gidlist, (int)id, name, (int)id2);
-+ node = add_to_list(&gidlist, (int)id, name ? name : NULL, (int)id2);
+- return node;
+-}
+-
+-/* Add a gid to the list of gids. Only called on receiving side. */
+-static struct idlist *recv_add_gid(gid_t id, char *name)
+-{
+- gid_t id2 = name ? map_gid(id, name) : id;
+- struct idlist *node;
+-
+- node = add_to_list(&gidlist, id, name, id2,
+- !am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0);
++ node = add_to_list(idmap_ptr, id, *name ? name : NULL, id2,
++ !am_root && idmap_ptr == &gidmap
++ && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0);
if (verbose > 3) {
- rprintf(FINFO, "gid %d(%s) maps to %d\n",
-- (int)id, name ? name : "", (int)id2);
-+ (int)id, name, (int)id2);
+- rprintf(FINFO, "gid %u(%s) maps to %u\n",
+- (unsigned)id, name ? name : "", (unsigned)id2);
++ rprintf(FINFO, "%sid %u(%s) maps to %u\n",
++ idmap_ptr == &uidmap ? "u" : "g",
++ (unsigned)id, name, (unsigned)id2);
}
- return id2;
-@@ -192,12 +248,9 @@ static gid_t recv_add_gid(gid_t id, char
+ return node;
+@@ -194,12 +198,9 @@ static struct idlist *recv_add_gid(gid_t
/* this function is a definate candidate for a faster algorithm */
uid_t match_uid(uid_t uid)
{
if (uid == last_in)
return last_out;
-@@ -208,7 +261,7 @@ uid_t match_uid(uid_t uid)
- return last_out = (uid_t)list->id2;
+@@ -207,10 +208,13 @@ uid_t match_uid(uid_t uid)
+
+ for (list = uidlist; list; list = list->next) {
+ if (list->id == uid)
+- return last_out = list->id2;
++ break;
}
- return last_out = uid;
-+ return last_out = recv_add_uid(uid, NULL);
++ if (!list)
++ list = recv_add_id(&uidmap, uid, NULL);
++
++ return last_out = list->id2;
}
- gid_t match_gid(gid_t gid)
-@@ -344,15 +397,95 @@ void recv_uid_list(int f, struct file_li
+ gid_t match_gid(gid_t gid, uint16 *flags_ptr)
+@@ -226,7 +230,7 @@ gid_t match_gid(gid_t gid, uint16 *flags
+ break;
+ }
+ if (!list)
+- list = recv_add_gid(gid, NULL);
++ list = recv_add_id(&gidmap, gid, NULL);
+ last = list;
+ }
+
+@@ -315,7 +319,7 @@ uid_t recv_user_name(int f, uid_t uid)
+ if (!name)
+ out_of_memory("recv_user_name");
+ read_sbuf(f, name, len);
+- node = recv_add_uid(uid, name); /* node keeps name's memory */
++ node = recv_add_id(&uidmap, uid, name); /* node keeps name's memory */
+ return node->id2;
+ }
+
+@@ -327,7 +331,7 @@ gid_t recv_group_name(int f, gid_t gid,
+ if (!name)
+ out_of_memory("recv_group_name");
+ read_sbuf(f, name, len);
+- node = recv_add_gid(gid, name); /* node keeps name's memory */
++ node = recv_add_id(&gidmap, gid, name); /* node keeps name's memory */
+ if (flags_ptr && node->flags & FLAG_SKIP_GROUP)
+ *flags_ptr |= FLAG_SKIP_GROUP;
+ return node->id2;
+@@ -354,17 +358,96 @@ void recv_id_list(int f, struct file_lis
/* Now convert all the uids/gids from sender values to our values. */
#ifdef SUPPORT_ACLS
- if (preserve_acls && !numeric_ids)
-+ if (preserve_acls && (!numeric_ids || usermap))
++ if (preserve_acls && (!numeric_ids || usermap || groupmap))
match_acl_ids();
#endif
- if (am_root && preserve_uid && !numeric_ids) {
+ if (am_root && preserve_uid && (!numeric_ids || usermap)) {
- for (i = 0; i < flist->count; i++)
- F_OWNER(flist->files[i]) = match_uid(F_UID(flist->files[i]));
+ for (i = 0; i < flist->used; i++)
+ F_OWNER(flist->files[i]) = match_uid(F_OWNER(flist->files[i]));
}
- if (preserve_gid && (!am_root || !numeric_ids)) {
+ if (preserve_gid && (!am_root || !numeric_ids || groupmap)) {
- for (i = 0; i < flist->count; i++)
- F_GROUP(flist->files[i]) = match_gid(F_GID(flist->files[i]));
+ for (i = 0; i < flist->used; i++) {
+ F_GROUP(flist->files[i]) = match_gid(F_GROUP(flist->files[i]),
+ &flist->files[i]->flags);
+ }
}
}
+
+void parse_name_map(char *map, int usernames)
+{
++ struct idlist **idmap_ptr = usernames ? &uidmap : &gidmap;
++ struct idlist **idlist_ptr = usernames ? &uidlist : &gidlist;
+ char *colon, *end, *cp = map + strlen(map);
-+ int id1, id2;
++ id_t id1, id2;
++ uint16 flags;
+
+ while (1) {
+ end = cp;
+ usernames ? "user" : "group", cp);
+ exit_cleanup(RERR_SYNTAX);
+ }
++ flags = 0;
+ id1 = atoi(cp);
-+ } else if (strpbrk(cp, "*[?"))
-+ id1 = -2;
-+ else
-+ id1 = -1;
++ } else if (strpbrk(cp, "*[?")) {
++ flags = NFLAGS_WILD_NAME_MATCH;
++ id1 = 0;
++ } else {
++ flags = NFLAGS_NAME_MATCH;
++ id1 = 0;
++ }
+
+ if (isDigit(colon+1)) {
+ if (strspn(colon+1, "0123456789") != (size_t)(end - colon - 1)) {
+ } else {
+ if (usernames) {
+ uid_t uid;
-+ if (name_to_uid(colon+1, &uid))
-+ id2 = (int)uid;
-+ else
-+ id2 = -1;
++ if (!name_to_uid(colon+1, &uid)) {
++ bad_name:
++ rprintf(FERROR,
++ "Invalid name in --%smap: %s\n",
++ usernames ? "user" : "group",
++ colon+1);
++ exit_cleanup(RERR_SYNTAX);
++ }
++ id2 = uid;
+ } else {
+ gid_t gid;
-+ if (name_to_gid(colon+1, &gid))
-+ id2 = (int)gid;
-+ else
-+ id2 = -1;
-+ }
-+ if (id2 < 0) {
-+ rprintf(FERROR, "Invalid name in --%smap: %s\n",
-+ usernames ? "user" : "group", colon+1);
-+ exit_cleanup(RERR_SYNTAX);
++ if (!name_to_gid(colon+1, &gid))
++ goto bad_name;
++ id2 = gid;
+ }
+ }
+
-+ if (usernames) {
-+ add_to_list(&uidmap, id1, id1 < 0 ? cp : NULL, id2);
-+ if (numeric_ids && id2 >= 0)
-+ add_to_list(&uidlist, id1, NULL, id2);
-+ } else {
-+ add_to_list(&gidmap, id1, id1 < 0 ? cp : NULL, id2);
-+ if (numeric_ids && id2 >= 0)
-+ add_to_list(&gidlist, id1, NULL, id2);
-+ }
++ add_to_list(idmap_ptr, id1, flags ? cp : NULL, id2, flags);
++ if (numeric_ids && !flags)
++ add_to_list(idlist_ptr, id1, NULL, id2, flags);
+
+ if (cp == map)
+ break;
+ *--cp = '\0'; /* replace comma */
+ }
+
-+ if (usernames) {
-+ char *name = uid_to_name(0);
-+ recv_add_uid(0, name ? name : "root");
-+ } else {
-+ char *name = gid_to_name(0);
-+ recv_add_gid(0, name ? name : "root");
-+ }
++ /* The 0 user/group doesn't get its name sent, or add it explicitly. */
++ if (numeric_ids)
++ cp = NULL;
++ else
++ cp = usernames ? uid_to_name(0) : gid_to_name(0);
++ recv_add_id(idmap_ptr, 0, cp);
+}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff