From 0ad8c12d48d1d7bc57b8def7b638846499104265 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 28 Jul 2011 09:49:34 +0200 Subject: s3:modules:nfs4_acls: improve fix for bug #8330 simplify the check insmbacl4_find_equal_special() Signed-off-by: Michael Adam Autobuild-User: Michael Adam Autobuild-Date: Thu Jul 28 13:20:38 CEST 2011 on sn-devel-104 --- source3/modules/nfs4_acls.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index f1c2904c9e..2e5ffbcad0 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -519,10 +519,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) { -- cgit