The branch, master has been updated via abf3573 s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken from 133fb0e s3-spoolss: Use get_session_info_system().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit abf3573c21510717edb0fb9ce5080c1a24c35714 Author: Christian Ambach <a...@samba.org> Date: Wed Jul 27 14:46:00 2011 +0200 s3:modules fix Bug 8330 NFSv4 ACL merging logic is broken we should not merge ACEs with different flags (e.g. CI/OI/I/) Otherwise ACLs get wrong entries and thus wrong semantics Example: ACL:BUILTIN\Users:ALLOWED/0x0/FULL ACL:BUILTIN\Users:ALLOWED/I/READ got merged to ACL:BUILTIN\Users:ALLOWED/I/FULL This is not the same and also leads to wrong displays in the Windows ACL dialog Autobuild-User: Christian Ambach <a...@samba.org> Autobuild-Date: Wed Jul 27 16:03:51 CEST 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/modules/nfs4_acls.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 09ef522..f1c2904 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -519,8 +519,7 @@ static SMB_ACE4PROP_T *smbacl4_find_equal_special( if (ace->flags == aceNew->flags && ace->aceType==aceNew->aceType && - ((ace->aceFlags&SMB_ACE4_INHERIT_ONLY_ACE)== - (aceNew->aceFlags&SMB_ACE4_INHERIT_ONLY_ACE)) && + ace->aceFlags==aceNew->aceFlags && (ace->aceFlags&SMB_ACE4_IDENTIFIER_GROUP)== (aceNew->aceFlags&SMB_ACE4_IDENTIFIER_GROUP) ) { -- Samba Shared Repository