summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorChristian Ambach <ambi@samba.org>2011-07-27 14:46:00 +0200
committerChristian Ambach <ambi@samba.org>2011-07-27 16:03:51 +0200
commitabf3573c21510717edb0fb9ce5080c1a24c35714 (patch)
tree3e8134d974408615f2b673117f859ded27b8fd07 /source3
parent133fb0ebcc070bd3ae4aebcc3a759eca98101495 (diff)
downloadsamba-abf3573c21510717edb0fb9ce5080c1a24c35714.tar.gz
samba-abf3573c21510717edb0fb9ce5080c1a24c35714.tar.bz2
samba-abf3573c21510717edb0fb9ce5080c1a24c35714.zip
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 <ambi@samba.org> Autobuild-Date: Wed Jul 27 16:03:51 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/modules/nfs4_acls.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 09ef522b41..f1c2904c9e 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)
) {