summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/modules/nfs4_acls.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index e94abacc48..a60d98fddc 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -337,13 +337,12 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
DEBUG(10, ("Windows mapped ace flags: 0x%x => 0x%x\n",
ace->aceFlags, win_ace_flags));
+ mask = ace->aceMask;
/* Windows clients expect SYNC on acls to
correctly allow rename. See bug #7909. */
- if(ace->aceType & SMB_ACE4_ACCESS_DENIED_ACE_TYPE) {
- /* But not on DENY ace entries. See
- bug #8442. */
- mask = ace->aceMask;
- } else {
+ /* But not on DENY ace entries. See
+ bug #8442. */
+ if(ace->aceType == SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE) {
mask = ace->aceMask | SMB_ACE4_SYNCHRONIZE;
}
init_sec_ace(&nt_ace_list[good_aces++], &sid,