From aebf82d0f8754ffa96ff6755cd54708fecbd481c Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Wed, 27 Jul 2011 14:46:00 +0200 Subject: [PATCH] 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 Autobuild-Date: Wed Jul 27 16:03:51 CEST 2011 on sn-devel-104 --- source3/modules/nfs4_acls.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index be8a505..0504779 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -516,8 +516,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) ) { -- 1.7.4.4