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
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)
) {