From: Michael Adam <obnox@samba.org>
Date: Thu, 28 Jul 2011 07:49:34 +0000 (+0200)
Subject: s3:modules:nfs4_acls: improve fix for bug #8330
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1ab64cbc2d62744f541eea0d80d7b522416ac1c;p=thirdparty%2Fsamba.git

s3:modules:nfs4_acls: improve fix for bug #8330

simplify the check insmbacl4_find_equal_special()

Signed-off-by: Michael Adam <obnox@samba.org>
---

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 05047797b76..c9d795d35c8 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -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)
 			{