[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  600451d Fix bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
      from  8745c70 s3:winbind: put winbindd_cache into the state dir, not the cache dir

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


- Log -----------------------------------------------------------------
commit 600451da33728cbd377b122c85cf146f5b319998
Author: Ira Cooper <ira at wakeful.net>
Date:   Wed Sep 7 12:24:22 2011 -0700

    Fix bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
    
    Thanks to Youzhong Yang for discovering this issue.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Sep  7 22:56:06 CEST 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 041aee2..e94abac 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -339,7 +339,13 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
 
 		/* Windows clients expect SYNC on acls to
 		   correctly allow rename. See bug #7909. */
-		mask = ace->aceMask | SMB_ACE4_SYNCHRONIZE;
+		if(ace->aceType & SMB_ACE4_ACCESS_DENIED_ACE_TYPE) {
+			/* But not on DENY ace entries. See
+			   bug #8442. */
+			mask = ace->aceMask;
+		} else {
+			mask = ace->aceMask | SMB_ACE4_SYNCHRONIZE;
+		}
 		init_sec_ace(&nt_ace_list[good_aces++], &sid,
 			ace->aceType, mask,
 			win_ace_flags);


-- 
Samba Shared Repository