summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-07-28 09:49:34 +0200
committerMichael Adam <obnox@samba.org>2011-07-28 13:20:38 +0200
commit0ad8c12d48d1d7bc57b8def7b638846499104265 (patch)
treed5aee44f772e95856034a88d3fdfba8e0a08917d
parent7b7c6c85f16a69c346057fcfee830c65aa4b6ed0 (diff)
downloadsamba-0ad8c12d48d1d7bc57b8def7b638846499104265.tar.gz
samba-0ad8c12d48d1d7bc57b8def7b638846499104265.tar.bz2
samba-0ad8c12d48d1d7bc57b8def7b638846499104265.zip
s3:modules:nfs4_acls: improve fix for bug #8330
simplify the check insmbacl4_find_equal_special() Signed-off-by: Michael Adam <obnox@samba.org> Autobuild-User: Michael Adam <obnox@samba.org> Autobuild-Date: Thu Jul 28 13:20:38 CEST 2011 on sn-devel-104
-rw-r--r--source3/modules/nfs4_acls.c6
1 files changed, 2 insertions, 4 deletions
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)
{