[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  2792a83 Don't send user/group names for ACLs with --numeric-ids. Fixes bug 8020.
      from  0b67d5e Fix xattrs test on OS X.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2792a83d582010863fb8fcd4a031895fcdb818dd
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.

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

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


Changeset truncated at 500 lines:

diff --git a/acls.c b/acls.c
index 91afb32..90279fc 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);


-- 
The rsync repository.