From 1026680518de4cf66f7c202536d0e555ec608e1d Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Tue, 25 Jun 2019 15:21:06 -0700 Subject: [PATCH] nfs4_acls: Use correct type when checking ownerGID uid and gid are members of the same union so this makes no difference, but for type correctness and readability use the gid to check for ownerGID. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14032 Signed-off-by: Christof Schmitt Reviewed-by: Ralph Boehme (cherry picked from commit 3b3d722ce579c19c7b08d06a3adea275537545dc) --- source3/modules/nfs4_acls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index f8861e9058b..b2ba4d1d701 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -856,7 +856,7 @@ static int smbacl4_substitute_simple( if (!(ace->flags & SMB_ACE4_ID_SPECIAL) && ace->aceFlags & SMB_ACE4_IDENTIFIER_GROUP && - ace->who.uid == ownerGID && + ace->who.gid == ownerGID && !(ace->aceFlags & SMB_ACE4_INHERIT_ONLY_ACE) && !(ace->aceFlags & SMB_ACE4_FILE_INHERIT_ACE) && !(ace->aceFlags & SMB_ACE4_DIRECTORY_INHERIT_ACE)) { -- 2.47.2