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

Fixes bug 8020.

diff --git a/acls.c b/acls.c
index 91afb32..90279fc 100644 (file)
--- 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;
                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
                } 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);
                write_varint(f, ida->id);
                if (inc_recurse && name) {
                        int len = strlen(name);