Tidy up previous patch for bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE...

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
(cherry picked from commit 0aa6751e919d842cdae044be26f6da725063eac2)

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index bea452880e64029b99328fc43fd21391ba8ff447..e5cc32dd1c452c7eecbd6dd5407755db6e4e896e 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -335,13 +335,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,