./configure (optional if already run)
make
---- old/flist.c
-+++ new/flist.c
-@@ -61,6 +61,8 @@ extern int copy_links;
- extern int copy_unsafe_links;
- extern int protocol_version;
- extern int sanitize_paths;
-+extern char *usermap;
-+extern char *groupmap;
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -70,6 +70,7 @@ extern int need_unsorted_flist;
+ extern int unsort_ndx;
extern struct stats stats;
+ extern char *filesfrom_host;
++extern char *usermap, *groupmap;
extern char curr_dir[MAXPATHLEN];
-@@ -741,7 +743,7 @@ static struct file_struct *recv_file_ent
+
+@@ -760,7 +761,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
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);
+@@ -772,7 +773,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+ 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)
+@@ -2158,8 +2159,13 @@ struct file_list *recv_file_list(int f)
int dstart, flags;
int64 start_read;
if (show_filelist_p())
start_filelist_progress("receiving file list");
else if (inc_recurse && verbose && !am_server && !first_flist)
---- old/options.c
-+++ new/options.c
-@@ -156,6 +156,8 @@ char *rsync_path = RSYNC_PATH;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -167,6 +167,8 @@ char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
char *sockopts = NULL;
int rsync_port = 0;
int compare_dest = 0;
int copy_dest = 0;
-@@ -367,6 +369,8 @@ void usage(enum logcode F)
+@@ -384,6 +386,8 @@ void usage(enum logcode F)
rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n");
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
+ rprintf(F," --usermap=STRING custom username mapping\n");
+ rprintf(F," --groupmap=STRING custom groupname mapping\n");
- rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
+ 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");
- 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 },
+@@ -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 },
{"timeout", 0, POPT_ARG_INT, &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
- args[ac++] = "--numeric-ids";
+ {"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)
+ args[ac++] = "--use-qsort";
if (am_sender) {
+ if (usermap) {
if (ignore_existing)
args[ac++] = "--ignore-existing";
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -367,6 +367,8 @@ to the detailed description below for a
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -378,6 +378,8 @@ to the detailed description below for a complete description. verb(
--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
+ --usermap=STRING custom username mapping
+ --groupmap=STRING custom groupname mapping
- --timeout=TIME set I/O timeout in seconds
+ --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
- --size-only skip files that match in size
-@@ -1451,6 +1453,46 @@ from the source system is used instead.
+@@ -1602,6 +1604,46 @@ 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.
dit(bf(--timeout=TIMEOUT)) This option allows you to set a maximum I/O
timeout in seconds. If no data is transferred for the specified time
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;
+diff --git a/uidlist.c b/uidlist.c
+--- a/uidlist.c
++++ b/uidlist.c
+@@ -24,6 +24,7 @@
+ * are special. */
+
+ #include "rsync.h"
++#include "ifuncs.h"
+ #include "io.h"
+
+ extern int verbose;
+@@ -32,6 +33,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
+@@ -41,6 +44,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;
+ const char *name;
+@@ -48,8 +54,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)
-@@ -80,22 +82,6 @@ static char *gid_to_name(gid_t gid)
+ static struct idlist *add_to_list(struct idlist **root, id_t id, const char *name,
+ id_t id2, uint16 flags)
+@@ -84,22 +90,6 @@ static const char *gid_to_name(gid_t gid)
return NULL;
}
--static uid_t map_uid(uid_t id, char *name)
+-static uid_t map_uid(uid_t id, const char *name)
-{
- uid_t uid;
- if (id != 0 && name_to_uid(name, &uid))
- return id;
-}
-
--static gid_t map_gid(gid_t id, char *name)
+-static gid_t map_gid(gid_t id, const char *name)
-{
- gid_t gid;
- if (id != 0 && name_to_gid(name, &gid))
static int is_in_group(gid_t gid)
{
#ifdef HAVE_GETGROUPS
-@@ -155,35 +141,52 @@ static int is_in_group(gid_t gid)
+@@ -159,34 +149,49 @@ static int is_in_group(gid_t gid)
#endif
}
-/* 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 *recv_add_uid(uid_t id, const char *name)
+/* Add a uid/gid to its list of ids. Only called on receiving side. */
-+static int recv_add_id(struct idlist **idmap_ptr, int id, char *name)
++static struct idlist *recv_add_id(struct idlist **idmap_ptr, id_t id, const char *name)
{
- uid_t id2 = name ? map_uid(id, name) : id;
struct idlist *node;
-+ int 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 = "";
- if (verbose > 3) {
-- rprintf(FINFO, "uid %d(%s) maps to %d\n",
-- (int)id, name ? name : "", (int)id2);
+- rprintf(FINFO, "uid %u(%s) maps to %u\n",
+- (unsigned)id, name ? name : "", (unsigned)id2);
+ for (node = *idmap_ptr; node; node = node->next) {
-+ switch (node->id) {
-+ case -2:
++ 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:
++ } else {
+ if (node->id != id)
+ continue;
-+ break;
+ }
+ break;
}
+ else if (*name && id) {
+ if (idmap_ptr == &uidmap) {
+ uid_t uid;
-+ id2 = name_to_uid(name, &uid) ? (int)uid : id;
++ id2 = name_to_uid(name, &uid) ? uid : id;
+ } else {
+ gid_t gid;
-+ id2 = name_to_gid(name, &gid) ? (int)gid : id;
++ id2 = name_to_gid(name, &gid) ? gid : id;
+ }
+ } else
+ id2 = id;
-- return id2;
+- return node;
-}
-
-/* Add a gid to the list of gids. Only called on receiving side. */
--static gid_t recv_add_gid(gid_t id, char *name)
+-static struct idlist *recv_add_gid(gid_t id, const char *name)
-{
- gid_t id2 = name ? map_gid(id, name) : id;
- struct idlist *node;
-
-- if (!am_root && !is_in_group(id2))
-+ if (idmap_ptr == &gidmap && !am_root && !is_in_group(id2))
- id2 = GID_NONE;
-- node = add_to_list(&gidlist, (int)id, name, (int)id2);
-+ node = add_to_list(idmap_ptr, id, *name ? name : NULL, id2);
+- 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);
-+ rprintf(FINFO, "%sid %d(%s) maps to %d\n",
-+ idmap_ptr == &uidmap ? "u" : "g", id, name, 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 +195,9 @@ static gid_t recv_add_gid(gid_t id, char
+ return node;
+@@ -195,12 +200,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,7 +208,7 @@ uid_t match_uid(uid_t uid)
- return last_out = (uid_t)list->id2;
+@@ -208,10 +210,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 = (uid_t)recv_add_id(&uidmap, (int)uid, NULL);
++ if (!list)
++ list = recv_add_id(&uidmap, uid, NULL);
++
++ return last_out = list->id2;
}
- gid_t match_gid(gid_t gid)
-@@ -229,7 +229,7 @@ gid_t match_gid(gid_t gid)
- return last_out = (gid_t)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)
+ break;
+ }
+ if (!list)
+- list = recv_add_gid(gid, NULL);
++ list = recv_add_id(&gidmap, gid, NULL);
+ last = list;
}
-- return last_out = recv_add_gid(gid, NULL);
-+ return last_out = (gid_t)recv_add_id(&gidmap, (int)gid, NULL);
- }
-
- /* Add a uid to the list of uids. Only called on sending side. */
-@@ -311,7 +311,7 @@ uid_t recv_user_name(int f, uid_t uid)
- if (!name)
- out_of_memory("recv_user_name");
- read_sbuf(f, name, len);
-- return recv_add_uid(uid, name); /* node keeps name's memory */
-+ return (uid_t)recv_add_id(&uidmap, (int)uid, name); /* node keeps name's memory */
- }
-
- gid_t recv_group_name(int f, gid_t gid)
-@@ -321,7 +321,7 @@ gid_t recv_group_name(int f, gid_t gid)
- if (!name)
- out_of_memory("recv_group_name");
- read_sbuf(f, name, len);
-- return recv_add_gid(gid, name); /* node keeps name's memory */
-+ return (gid_t)recv_add_id(&gidmap, (int)gid, name); /* node keeps name's memory */
+@@ -320,7 +325,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 */
+ return node->id2;
}
- /* recv a complete uid/gid mapping from the peer and map the uid/gid
-@@ -344,15 +344,88 @@ void recv_uid_list(int f, struct file_li
+@@ -336,7 +341,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 */
+ 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)
/* 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);
+ }
}
}
+
+ 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)) {
+ colon+1);
+ exit_cleanup(RERR_SYNTAX);
+ }
-+ id2 = (int)uid;
++ id2 = uid;
+ } else {
+ gid_t gid;
+ if (!name_to_gid(colon+1, &gid))
+ goto bad_name;
-+ id2 = (int)gid;
++ id2 = gid;
+ }
+ }
+
-+ add_to_list(idmap_ptr, id1, id1 < 0 ? cp : NULL, id2);
-+ if (numeric_ids && id2 >= 0)
-+ add_to_list(idlist_ptr, 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 (numeric_ids)
-+ cp = NULL;
-+ else
-+ cp = usernames ? uid_to_name(0) : gid_to_name(0);
-+ recv_add_id(idmap_ptr, 0, cp);
++ /* The 0 user/group doesn't get its name sent, so add it explicitly. */
++ recv_add_id(idmap_ptr, 0,
++ numeric_ids ? NULL : usernames ? uid_to_name(0) : gid_to_name(0));
+}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff