Fixed a problem with the ACLS_NEED_MASK code in unpack_smb_acl().

[rsync/rsync-patches.git] / acls.diff

diff --git a/acls.diff b/acls.diff
index 1d33830..5137260 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -377,7 +377,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +      sort_ida_entries(&racl->groups);
 +
 +#ifdef ACLS_NEED_MASK
-+      if (!racl->users.count && !racl->groups.count) {
++      if (!racl->users.count && !racl->groups.count && racl->mask != NO_ENTRY) {
 +              /* Throw away a superfluous mask, but mask off the
 +               * group perms with it first. */
 +              racl->group_obj &= racl->mask;