diff options
| -rw-r--r-- | sys/kern/kern_mib.c | 27 | ||||
| -rw-r--r-- | sys/kern/kern_prot.c | 6 | ||||
| -rw-r--r-- | sys/sys/systm.h | 1 |
3 files changed, 6 insertions, 28 deletions
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index bc480c3..2fdfde5 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -179,33 +179,6 @@ sysctl_kern_securelvl SYSCTL_HANDLER_ARGS return (error); } -SYSCTL_PROC(_kern, KERN_SECURELVL, securelevel, CTLTYPE_INT|CTLFLAG_RW, - 0, 0, sysctl_kern_securelvl, "I", "Current secure level"); - -int suser_permitted = 1; - -static int -sysctl_kern_suser_permitted SYSCTL_HANDLER_ARGS -{ - int error, flag; - - flag = suser_permitted; - - error = sysctl_handle_int(oidp, &flag, 0, req); - if (error || !req->newptr) - return (error); - if (flag != 0 && flag != 1) - return(EPERM); - if (!suser_permitted) - return(EPERM); - suser_permitted = flag; - return (0); -} - -SYSCTL_PROC(_kern, OID_AUTO, suser_permitted, - CTLTYPE_INT|CTLFLAG_RW, 0, 0, sysctl_kern_suser_permitted, "I", - "processes with uid 0 have privilege"); - char domainname[MAXHOSTNAMELEN]; SYSCTL_STRING(_kern, KERN_NISDOMAINNAME, domainname, CTLFLAG_RW, &domainname, sizeof(domainname), "Name of the current YP/NIS domain"); diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 9194e55..e001e2e 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -53,6 +53,7 @@ #include <sys/proc.h> #include <sys/malloc.h> #include <sys/pioctl.h> +#include <sys/sysctl.h> static MALLOC_DEFINE(M_CRED, "cred", "credentials"); @@ -931,6 +932,11 @@ groupmember(gid, cred) return (0); } +static int suser_permitted = 1; + +SYSCTL_INT(_kern, OID_AUTO, suser_permitted, CTLFLAG_RW, &suser_permitted, 0, + "processes with uid 0 have privilege"); + /* * Test whether the specified credentials imply "super-user" * privilege; if so, and we have accounting info, set the flag diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 059fd89..3f900a8 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -47,7 +47,6 @@ #include <sys/callout.h> extern int securelevel; /* system security level (see init(8)) */ -extern int suser_permitted; /* suser_xxx() is permitted to return 0 */ extern int cold; /* nonzero if we are doing a cold boot */ extern const char *panicstr; /* panic message */ |
