git: ffd3ef8ee025 - main - groupmember(), realgroupmember(): Return a bool instead of an int

The branch main has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=ffd3ef8ee0253ffaf214cf711251d112f6a2bcf6

commit ffd3ef8ee0253ffaf214cf711251d112f6a2bcf6
Author:     Olivier Certner <olce.freebsd@certner.fr>
AuthorDate: 2023-08-17 23:54:47 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-09-28 15:05:46 +0000

    groupmember(), realgroupmember(): Return a bool instead of an int
    
    Requested by:           mhorne
    Reviewed by:            mhorne
    MFC after:              2 weeks
    MFC to:                 stable/14 releng/14.0
    Sponsored by:           Kumacom SAS
    Differential Revision:  https://reviews.freebsd.org/D40958
---
 sys/kern/kern_prot.c | 12 ++++++------
 sys/sys/ucred.h      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 0f15771fb00d..00eb2fccdeef 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -1279,7 +1279,7 @@ sys___setugid(struct thread *td, struct __setugid_args *uap)
 /*
  * Returns whether gid designates a supplementary group in cred.
  */
-static int
+static bool
 supplementary_group_member(gid_t gid, struct ucred *cred)
 {
 	int l, h, m;
@@ -1306,12 +1306,12 @@ supplementary_group_member(gid_t gid, struct ucred *cred)
  * Check if gid is a member of the (effective) group set (i.e., effective and
  * supplementary groups).
  */
-int
+bool
 groupmember(gid_t gid, struct ucred *cred)
 {
 
-	if (cred->cr_groups[0] == gid)
-		return (1);
+	if (gid == cred->cr_groups[0])
+		return (true);
 
 	return (supplementary_group_member(gid, cred));
 }
@@ -1320,11 +1320,11 @@ groupmember(gid_t gid, struct ucred *cred)
  * Check if gid is a member of the real group set (i.e., real and supplementary
  * groups).
  */
-int
+bool
 realgroupmember(gid_t gid, struct ucred *cred)
 {
 	if (gid == cred->cr_rgid)
-		return (1);
+		return (true);
 
 	return (supplementary_group_member(gid, cred));
 }
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index 633bf436fcd4..7c9e46e47774 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -158,8 +158,8 @@ void	crcowfree(struct thread *td);
 void	cru2x(struct ucred *cr, struct xucred *xcr);
 void	cru2xt(struct thread *td, struct xucred *xcr);
 void	crsetgroups(struct ucred *cr, int n, gid_t *groups);
-int	groupmember(gid_t gid, struct ucred *cred);
-int	realgroupmember(gid_t gid, struct ucred *cred);
+bool	groupmember(gid_t gid, struct ucred *cred);
+bool	realgroupmember(gid_t gid, struct ucred *cred);
 #endif /* _KERNEL */
 
 #endif /* !_SYS_UCRED_H_ */