X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6500e0769a56919df1d47759828104a08df850bb..54d13604fa7521d7879c5552d56c197d6f542467:/acls.c diff --git a/acls.c b/acls.c index ef2751c3..90279fca 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); @@ -1101,6 +1101,9 @@ int default_perms_for_dir(const char *dir) if (sacl == NULL) { /* Couldn't get an ACL. Darn. */ switch (errno) { + case EINVAL: + /* If SMB_ACL_TYPE_DEFAULT isn't valid, then the ACLs must be non-POSIX. */ + break; #ifdef ENOTSUP case ENOTSUP: #endif