[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  0aa6751 Tidy up previous patch for bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
      from  7800a50 s4-provision: Fill msDS-NC-Replica-Locations attribute in DNS provisioning

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0aa6751e919d842cdae044be26f6da725063eac2
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Sep 7 14:57:11 2011 -0700

    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 at samba.org>
    Autobuild-Date: Thu Sep  8 03:34:39 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/nfs4_acls.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index e94abac..a60d98f 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,


-- 
Samba Shared Repository