diff options
| author | Jeremy Allison <jra@samba.org> | 2011-09-07 14:57:11 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-09-08 03:34:39 +0200 |
| commit | 0aa6751e919d842cdae044be26f6da725063eac2 (patch) | |
| tree | 87e306bc10a73f80dc948382e84913a1d0590f81 /source3/modules | |
| parent | 7800a501cda683a3b8d78b952740d7131515806c (diff) | |
| download | samba-0aa6751e919d842cdae044be26f6da725063eac2.tar.gz samba-0aa6751e919d842cdae044be26f6da725063eac2.tar.xz samba-0aa6751e919d842cdae044be26f6da725063eac2.zip | |
Tidy up previous patch for bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
aceType is an enum field, not a bitmask.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 8 03:34:39 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/nfs4_acls.c | 9 |
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, |