]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:modules:nfs4_acls: improve fix for bug #8330
authorMichael Adam <obnox@samba.org>
Thu, 28 Jul 2011 07:49:34 +0000 (09:49 +0200)
committerKarolin Seeger <kseeger@samba.org>
Tue, 9 Aug 2011 11:05:15 +0000 (13:05 +0200)
simplify the check insmbacl4_find_equal_special()

Signed-off-by: Michael Adam <obnox@samba.org>
source3/modules/nfs4_acls.c

index 05047797b769dedcd56094c87cb3b9f81f6d79b1..c9d795d35c84ce06b2169bb891a3c8cdb20d7455 100644 (file)
@@ -516,10 +516,8 @@ static SMB_ACE4PROP_T *smbacl4_find_equal_special(
 
                if (ace->flags == aceNew->flags &&
                        ace->aceType==aceNew->aceType &&
-                       ace->aceFlags==aceNew->aceFlags &&
-                       (ace->aceFlags&SMB_ACE4_IDENTIFIER_GROUP)==
-                       (aceNew->aceFlags&SMB_ACE4_IDENTIFIER_GROUP)
-               ) {
+                       ace->aceFlags==aceNew->aceFlags)
+               {
                        /* keep type safety; e.g. gid is an u.short */
                        if (ace->flags & SMB_ACE4_ID_SPECIAL)
                        {