[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Wed Apr 30 14:59:34 MDT 2014


The branch, master has been updated
       via  7665ba5 Fix usermap/groupmap parsing of MIN-MAX IDs.
      from  adc600c Check F_IS_ACTIVE() in a few more spots.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7665ba5b364e270a1239fda25ca925b19a4716d3
Author: Wayne Davison <wayned at samba.org>
Date:   Wed Apr 30 12:34:15 2014 -0700

    Fix usermap/groupmap parsing of MIN-MAX IDs.

-----------------------------------------------------------------------

Summary of changes:
 uidlist.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/uidlist.c b/uidlist.c
index c00e45a..641f147 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -473,12 +473,15 @@ void parse_name_map(char *map, BOOL usernames)
 					usernames ? "user" : "group", cp);
 				exit_cleanup(RERR_SYNTAX);
 			}
-			if (dash)
+			if (dash) {
+				*dash = '\0';
 				noiu.max_id = id_parse(dash+1);
-			else
+			} else
 				noiu.max_id = 0;
 			flags = 0;
 			id1 = id_parse(cp);
+			if (dash)
+				*dash = '-';
 		} else if (strpbrk(cp, "*[?")) {
 			flags = NFLAGS_WILD_NAME_MATCH;
 			noiu.name = cp;


-- 
The rsync repository.


More information about the rsync-cvs mailing list