git: 62b8258a7e43 - main - Change the return type of sv__setid_allowed from bool to int

[Konstantin Belousov]

The branch main has been updated by kib:

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

commit 62b8258a7e43f3c774f13eab758b2cfdf353073e
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-06-06 20:38:48 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-06-06 20:38:48 +0000

    Change the return type of sv__setid_allowed from bool to int
    
    to please some userspace code using sys/sysent.h.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
---
 sys/compat/linux/linux_mib.c | 2 +-
 sys/compat/linux/linux_mib.h | 2 +-
 sys/sys/sysent.h             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index 3a6627df9abd..13beba323787 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -104,7 +104,7 @@ SYSCTL_BOOL(_compat_linux, OID_AUTO, setid_allowed, CTLFLAG_RWTUN,
     &linux_setid_allowed, 0,
     "Allow setuid/setgid on execve of Linux binary");
 
-bool
+int
 linux_setid_allowed_query(struct thread *td __unused,
     struct image_params *imgp __unused)
 {
diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h
index adf71cb65401..61a3a38a23ae 100644
--- a/sys/compat/linux/linux_mib.h
+++ b/sys/compat/linux/linux_mib.h
@@ -72,6 +72,6 @@ extern int linux_preserve_vstatus;
 extern bool linux_map_sched_prio;
 
 struct image_params;
-bool linux_setid_allowed_query(struct thread *td, struct image_params *imgp);
+int linux_setid_allowed_query(struct thread *td, struct image_params *imgp);
 
 #endif /* _LINUX_MIB_H_ */
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index 4a707b41e020..c2cbd77a92b9 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -148,7 +148,7 @@ struct sysentvec {
 	void		(*sv_onexec)(struct proc *, struct image_params *);
 	void		(*sv_onexit)(struct proc *);
 	void		(*sv_ontdexit)(struct thread *td);
-	bool		(*sv_setid_allowed)(struct thread *td,
+	int		(*sv_setid_allowed)(struct thread *td,
 			    struct image_params *imgp);
 };