[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  46798c8 Tidy up previous patch for bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
       via  8678e21 Fix bug #8442 - NFSv4 DENY ACLs always include SYNCHRONIZE flag - blocking renames.
      from  495d164 s3-docs: Fix typo.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


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

commit 8678e2158064e075ed276a2a4f1ac552903af414
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
    (cherry picked from commit 600451da33728cbd377b122c85cf146f5b319998)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index c9d795d..e5cc32d 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -335,9 +335,14 @@ 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. */
-		mask = ace->aceMask | SMB_ACE4_SYNCHRONIZE;
+		/* 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,
 			ace->aceType, mask,
 			win_ace_flags);


-- 
Samba Shared Repository