[SCM] The rsync repository. - branch b3.0.x updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Fri Mar 18 15:53:25 MDT 2011


The branch, b3.0.x has been updated
       via  e71130f Don't send user/group names for ACLs with --numeric-ids. Fixes bug 8020.
       via  38c9f1b Get rid of an unused extern.
      from  779663f Fix xattrs test on OS X.

;a=shortlog;h=b3.0.x


- Log -----------------------------------------------------------------
commit e71130fd7739562cd190a92d3f8bcbda02168892
Author: Wayne Davison <wayned at samba.org>
Date:   Fri Mar 18 14:42:28 2011 -0700

    Don't send user/group names for ACLs with --numeric-ids.
    Fixes bug 8020.

commit 38c9f1becf7b19202ef942919aee38603e31e33b
Author: Wayne Davison <wayned at samba.org>
Date:   Thu Mar 17 11:25:12 2011 -0700

    Get rid of an unused extern.

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

Summary of changes:
 acls.c |    4 ++--
 util.c |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/acls.c b/acls.c
index 9fac3cd..e6f6088 100644
--- a/acls.c
+++ b/acls.c
@@ -589,9 +589,9 @@ static void send_ida_entries(int f, const ida_entries *idal)
 		const char *name;
 		if (ida->access & NAME_IS_USER) {
 			xbits |= XFLAG_NAME_IS_USER;
-			name = add_uid(ida->id);
+			name = numeric_ids ? NULL : add_uid(ida->id);
 		} else
-			name = add_gid(ida->id);
+			name = numeric_ids ? NULL : add_gid(ida->id);
 		write_varint(f, ida->id);
 		if (inc_recurse && name) {
 			int len = strlen(name);
diff --git a/util.c b/util.c
index 7f207a3..a694fde 100644
--- a/util.c
+++ b/util.c
@@ -24,7 +24,6 @@
 #include "ifuncs.h"
 
 extern int verbose;
-extern int dry_run;
 extern int module_id;
 extern int modify_window;
 extern int relative_paths;


-- 
The rsync repository.


More information about the rsync-cvs mailing list