rprintf(F," --timeout=SECONDS set I/O timeout in seconds\n");
rprintf(F," --contimeout=SECONDS set daemon connection timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
+@@ -446,7 +450,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+ OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
+ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
+- OPT_NO_D, OPT_APPEND, OPT_NO_ICONV,
++ OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_USERMAP, OPT_GROUPMAP,
+ OPT_SERVER, OPT_REFUSED_BASE = 9000};
+
+ static struct poptOption long_options[] = {
@@ -622,6 +626,8 @@ static struct poptOption long_options[] = {
{"no-s", 0, POPT_ARG_VAL, &protect_args, 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 },
++ {"usermap", 0, POPT_ARG_STRING, 0, OPT_USERMAP, 0, 0 },
++ {"groupmap", 0, POPT_ARG_STRING, 0, OPT_GROUPMAP, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
{"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 },
{"contimeout", 0, POPT_ARG_INT, &connect_timeout, 0, 0, 0 },
-@@ -1991,6 +1997,18 @@ void server_options(char **args, int *argc_p)
+@@ -1228,6 +1234,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ }
+ break;
+
++ case OPT_USERMAP:
++ if (usermap) {
++ snprintf(err_buf, sizeof err_buf,
++ "You can only specify --usermap once.\n");
++ return 0;
++ }
++ usermap = (char *)poptGetOptArg(pc);
++ break;
++
++ case OPT_GROUPMAP:
++ if (groupmap) {
++ snprintf(err_buf, sizeof err_buf,
++ "You can only specify --groupmap once.\n");
++ return 0;
++ }
++ groupmap = (char *)poptGetOptArg(pc);
++ break;
++
+ case OPT_HELP:
+ usage(FINFO);
+ exit_cleanup(0);
+@@ -1997,6 +2021,18 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--use-qsort";
if (am_sender) {
--timeout=SECONDS set I/O timeout in seconds
--contimeout=SECONDS set daemon connection timeout in seconds
-I, --ignore-times don't skip files that match size and time
-@@ -1608,6 +1610,46 @@ from the source system is used instead. See also the comments on the
+@@ -1608,6 +1610,47 @@ from the source system is used instead. See also the comments on the
the chroot setting affects rsync's ability to look up the names of the
users and groups and what you can do about it.
+replaced with a bf(TO) value from the receiver. You may specify usernames
+or user IDs for the bf(FROM) and bf(TO) values, and the bf(FROM) value may
+also be a wild-card string, which will be matched against the sender's
-+names (wild-cards do NOT match against ID numbers). For example:
++names (wild-cards do NOT match against ID numbers, though see below for
++why a '*' matches everything). You may instead specify a range of ID
++numbers via an inclusive range: LOW-HIGH. For example:
+
-+verb( --usermap=0:bin,wayne:admin,*:nobody --groupmap=usr:1,1:usr)
++verb( --usermap=0-99:nobody,wayne:admin,*:normal --groupmap=usr:1,1:usr)
+
-+The first match in the list is the one that is used. You should not use
-+multiple options of the same type, but instead include all the user
-+mappings you need separated by commas to a single bf(--usermap) option,
-+and likewise for groups with the bf(--groupmap) option.
++The first match in the list is the one that is used. You should specify
++all your user mappings using a single bf(--usermap) option, and/or all
++your group mappings using a single bf(--groupmap) option.
+
+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 the sending side. All bf(TO) names match those in use on
-+the receiving side.
++the names in effect on the receiving side (typically "root"). All other
++bf(FROM) names match those in use on the sending side. All bf(TO) names
++match those in use on the receiving side.
+
-+Any IDs that do not have name on the sending side are treaded as having an
++Any IDs that do not have a name on the sending side are treated 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:
++a "*" or using an empty name. 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
++names, so all the IDs are treated 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.
+
static int is_in_group(gid_t gid)
{
#ifdef HAVE_GETGROUPS
-@@ -159,34 +149,49 @@ static int is_in_group(gid_t gid)
+@@ -159,34 +149,53 @@ 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, const 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, const char *name)
++static struct idlist *recv_add_id(struct idlist **idlist_ptr, struct idlist *idmap,
++ id_t id, const char *name)
{
- uid_t id2 = name ? map_uid(id, name) : id;
struct idlist *node;
++ int flag;
+ id_t id2;
- node = add_to_list(&uidlist, id, name, id2, 0);
- 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) {
++ for (node = idmap; node; node = node->next) {
+ if (node->flags & NFLAGS_WILD_NAME_MATCH) {
+ if (!wildmatch(node->name, name))
+ continue;
+ } else if (node->flags & NFLAGS_NAME_MATCH) {
+ if (strcmp(node->name, name) != 0)
+ continue;
++ } else if (node->name) {
++ if (id < node->id || id > (unsigned long)node->name)
++ continue;
+ } else {
+ if (node->id != id)
+ continue;
+ if (node)
+ id2 = node->id2;
+ else if (*name && id) {
-+ if (idmap_ptr == &uidmap) {
++ if (idmap == uidmap) {
+ uid_t uid;
+ id2 = name_to_uid(name, &uid) ? uid : id;
+ } else {
-
- 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);
++ flag = idmap == gidmap && !am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0;
++ node = add_to_list(idlist_ptr, id, *name ? name : NULL, id2, flag);
if (verbose > 3) {
- 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",
++ idmap == uidmap ? "u" : "g",
+ (unsigned)id, name, (unsigned)id2);
}
return node;
-@@ -195,12 +200,9 @@ static struct idlist *recv_add_gid(gid_t id, const char *name)
+@@ -195,12 +204,9 @@ static struct idlist *recv_add_gid(gid_t id, const char *name)
/* 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,10 +210,13 @@ uid_t match_uid(uid_t uid)
+@@ -208,10 +214,13 @@ uid_t match_uid(uid_t uid)
for (list = uidlist; list; list = list->next) {
if (list->id == uid)
- return last_out = uid;
+ if (!list)
-+ list = recv_add_id(&uidmap, uid, NULL);
++ list = recv_add_id(&uidlist, uidmap, uid, NULL);
+
+ return last_out = list->id2;
}
gid_t match_gid(gid_t gid, uint16 *flags_ptr)
-@@ -227,7 +232,7 @@ gid_t match_gid(gid_t gid, uint16 *flags_ptr)
+@@ -227,7 +236,7 @@ gid_t match_gid(gid_t gid, uint16 *flags_ptr)
break;
}
if (!list)
- list = recv_add_gid(gid, NULL);
-+ list = recv_add_id(&gidmap, gid, NULL);
++ list = recv_add_id(&gidlist, gidmap, gid, NULL);
last = list;
}
-@@ -320,7 +325,7 @@ uid_t recv_user_name(int f, uid_t uid)
+@@ -320,7 +329,7 @@ uid_t recv_user_name(int f, uid_t uid)
free(name);
name = NULL;
}
- node = recv_add_uid(uid, name); /* node keeps name's memory */
-+ node = recv_add_id(&uidmap, uid, name); /* node keeps name's memory */
++ node = recv_add_id(&uidlist, uidmap, uid, name); /* node keeps name's memory */
return node->id2;
}
-@@ -336,7 +341,7 @@ gid_t recv_group_name(int f, gid_t gid, uint16 *flags_ptr)
+@@ -336,7 +345,7 @@ gid_t recv_group_name(int f, gid_t gid, uint16 *flags_ptr)
free(name);
name = NULL;
}
- node = recv_add_gid(gid, name); /* node keeps name's memory */
-+ node = recv_add_id(&gidmap, gid, name); /* node keeps name's memory */
++ node = recv_add_id(&gidlist, gidmap, gid, name); /* node keeps name's memory */
if (flags_ptr && node->flags & FLAG_SKIP_GROUP)
*flags_ptr |= FLAG_SKIP_GROUP;
return node->id2;
-@@ -363,17 +368,93 @@ void recv_id_list(int f, struct file_list *flist)
+@@ -363,17 +372,103 @@ void recv_id_list(int f, struct file_list *flist)
/* Now convert all the uids/gids from sender values to our values. */
#ifdef SUPPORT_ACLS
+{
+ struct idlist **idmap_ptr = usernames ? &uidmap : &gidmap;
+ struct idlist **idlist_ptr = usernames ? &uidlist : &gidlist;
-+ char *colon, *end, *cp = map + strlen(map);
-+ id_t id1, id2;
++ char *colon, *end, *name, *cp = map + strlen(map);
++ id_t id1;
+ uint16 flags;
+
++ /* Parse the list in reverse, so the order in the struct is right. */
+ while (1) {
+ end = cp;
+ while (cp > map && cp[-1] != ',') cp--;
+ usernames ? "user" : "group", cp);
+ exit_cleanup(RERR_SYNTAX);
+ }
++ if (!colon[1]) {
++ rprintf(FERROR, "No name found after colon --%smap: %s\n",
++ usernames ? "user" : "group", cp);
++ exit_cleanup(RERR_SYNTAX);
++ }
+ *colon = '\0';
+
+ if (isDigit(cp)) {
-+ if (strspn(cp, "0123456789") != (size_t)(colon - cp)) {
++ 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);
+ }
++ if (dash)
++ name = (char *)atol(dash+1);
++ else
++ name = (char *)0;
+ flags = 0;
-+ id1 = atoi(cp);
++ id1 = atol(cp);
+ } else if (strpbrk(cp, "*[?")) {
+ flags = NFLAGS_WILD_NAME_MATCH;
++ name = cp;
+ id1 = 0;
+ } else {
+ flags = NFLAGS_NAME_MATCH;
++ name = cp;
+ id1 = 0;
+ }
+
+ cp = colon+1;
+ goto bad_number;
+ }
-+ id2 = atoi(colon+1);
++ add_to_list(idmap_ptr, id1, name, atol(colon+1), flags);
++ } else if (usernames) {
++ uid_t uid;
++ if (name_to_uid(colon+1, &uid))
++ add_to_list(idmap_ptr, id1, name, uid, flags);
++ else {
++ rprintf(FERROR,
++ "Unknown --usermap name on receiver: %s\n",
++ colon+1);
++ }
+ } else {
-+ if (usernames) {
-+ uid_t uid;
-+ 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))
-+ goto bad_name;
-+ id2 = gid;
++ gid_t gid;
++ if (name_to_gid(colon+1, &gid))
++ add_to_list(idmap_ptr, id1, name, gid, flags);
++ else {
++ rprintf(FERROR,
++ "Unknown --groupmap name on receiver: %s\n",
++ colon+1);
+ }
+ }
+
-+ 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;
+
+ }
+
+ /* The 0 user/group doesn't get its name sent, so add it explicitly. */
-+ recv_add_id(idmap_ptr, 0,
++ recv_add_id(idlist_ptr, *idmap_ptr, 0,
+ numeric_ids ? NULL : usernames ? uid_to_name(0) : gid_to_name(0));
+}
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff