From: Christof Schmitt <cs@samba.org>
Date: Tue, 25 Jun 2019 22:21:06 +0000 (-0700)
Subject: nfs4_acls: Use correct type when checking ownerGID
X-Git-Tag: samba-4.9.12~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1026680518de4cf66f7c202536d0e555ec608e1d;p=thirdparty%2Fsamba.git

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 <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 3b3d722ce579c19c7b08d06a3adea275537545dc)
---

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)) {