diff options
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_mod.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_jail.c | 1 | ||||
| -rw-r--r-- | sys/kern/kern_prot.c | 4 | ||||
| -rw-r--r-- | sys/kern/subr_prf.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_extattr.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_internal.h | 1 | ||||
| -rw-r--r-- | sys/sys/sysctl.h | 2 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_quota.c | 2 |
9 files changed, 3 insertions, 15 deletions
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 579b6fd..37d272a 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -252,8 +252,6 @@ SYSCTL_INT(_kern_hwpmc, OID_AUTO, mtxpoolsize, CTLFLAG_TUN|CTLFLAG_RD, * per-process measurements. This feature is turned off by default. */ -SYSCTL_DECL(_security_bsd); - static int pmc_unprivileged_syspmcs = 0; TUNABLE_INT("security.bsd.unprivileged_syspmcs", &pmc_unprivileged_syspmcs); SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_syspmcs, CTLFLAG_RW, diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 9be8487..be4757d 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); MALLOC_DEFINE(M_PRISON, "prison", "Prison structures"); -SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, jail, CTLFLAG_RW, 0, "Jail rules"); diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 2943939..a42ab93 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -70,9 +70,7 @@ __FBSDID("$FreeBSD$"); static MALLOC_DEFINE(M_CRED, "cred", "credentials"); -SYSCTL_DECL(_security); -SYSCTL_NODE(_security, OID_AUTO, bsd, CTLFLAG_RW, 0, - "BSD security policy"); +SYSCTL_NODE(_security, OID_AUTO, bsd, CTLFLAG_RW, 0, "BSD security policy"); #ifndef _SYS_SYSPROTO_H_ struct getpid_args { diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 12f29b6..bef5566 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -856,8 +856,6 @@ msgbufinit(void *ptr, int size) oldp = msgbufp; } -SYSCTL_DECL(_security_bsd); - static int unprivileged_read_msgbuf = 1; SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_read_msgbuf, CTLFLAG_RW, &unprivileged_read_msgbuf, 0, diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 15afddc..d7bcf97 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -1367,8 +1367,6 @@ link(td, uap) return (error); } -SYSCTL_DECL(_security_bsd); - static int hardlink_check_uid = 0; SYSCTL_INT(_security_bsd, OID_AUTO, hardlink_check_uid, CTLFLAG_RW, &hardlink_check_uid, 0, diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 15afddc..d7bcf97 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1367,8 +1367,6 @@ link(td, uap) return (error); } -SYSCTL_DECL(_security_bsd); - static int hardlink_check_uid = 0; SYSCTL_INT(_security_bsd, OID_AUTO, hardlink_check_uid, CTLFLAG_RW, &hardlink_check_uid, 0, diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index bcb95a2..61fd33d 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -40,7 +40,6 @@ * MAC Framework sysctl namespace. */ #ifdef SYSCTL_DECL -SYSCTL_DECL(_security); SYSCTL_DECL(_security_mac); #ifdef MAC_DEBUG SYSCTL_DECL(_security_mac_debug); diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index f544d7d..ef96c81 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -628,6 +628,8 @@ SYSCTL_DECL(_machdep); SYSCTL_DECL(_user); SYSCTL_DECL(_compat); SYSCTL_DECL(_regression); +SYSCTL_DECL(_security); +SYSCTL_DECL(_security_bsd); extern char machine[]; extern char osrelease[]; diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index dcb94d1..976fa71 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -58,8 +58,6 @@ __FBSDID("$FreeBSD$"); #include <ufs/ufs/ufsmount.h> #include <ufs/ufs/ufs_extern.h> -SYSCTL_DECL(_security_bsd); - static int unprivileged_get_quota = 0; SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_get_quota, CTLFLAG_RW, &unprivileged_get_quota, 0, |
