diff options
author | rwatson <rwatson@FreeBSD.org> | 2009-06-05 14:55:22 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2009-06-05 14:55:22 +0000 |
commit | f4934662e5d837053e785525653e390ce6933d2b (patch) | |
tree | 476e08b4812ed877bdf927598a5c7deae99fdcdf /sys/kern | |
parent | 4df1a4e912a3f28cda78498cc27541eb191be270 (diff) | |
download | FreeBSD-src-f4934662e5d837053e785525653e390ce6933d2b.zip FreeBSD-src-f4934662e5d837053e785525653e390ce6933d2b.tar.gz |
Move "options MAC" from opt_mac.h to opt_global.h, as it's now in GENERIC
and used in a large number of files, but also because an increasing number
of incorrect uses of MAC calls were sneaking in due to copy-and-paste of
MAC-aware code without the associated opt_mac.h include.
Discussed with: pjd
Diffstat (limited to 'sys/kern')
37 files changed, 0 insertions, 47 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 1f412c6..98c2b83 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_init_path.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index a7ddb17..7ec74a2 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -70,8 +70,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/acct.h> diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c index 9f37244..5296928 100644 --- a/sys/kern/kern_alq.c +++ b/sys/kern/kern_alq.c @@ -27,8 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c index 038515b..fc0039a 100644 --- a/sys/kern/kern_environment.c +++ b/sys/kern/kern_environment.c @@ -37,8 +37,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/types.h> #include <sys/param.h> #include <sys/proc.h> diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index f36f803..fcd8530 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include "opt_vm.h" #include <sys/param.h> diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 575fe9b..e24d7ea 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 0c16c3f..43afbbf 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index b6a6d56..7a8a090 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/types.h> diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 6e680fb..7506b6f 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index f032d43..fbfd6cf 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/kernel.h> diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 26b0250..58fa314 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -28,7 +28,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_param.h" #include <sys/param.h> diff --git a/sys/kern/kern_priv.c b/sys/kern/kern_priv.c index 6dd7d4b..352e502 100644 --- a/sys/kern/kern_priv.c +++ b/sys/kern/kern_priv.c @@ -29,7 +29,6 @@ */ #include "opt_kdtrace.h" -#include "opt_mac.h" #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 4e0bdf0..5deff69 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 3fc2e72..158b92a 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_kdb.h" -#include "opt_mac.h" #include "opt_panic.h" #include "opt_show_busybufs.h" #include "opt_sched.h" diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index d65041a..a9c2a33 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 5ab1ce5..57f0206 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_gdb.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 60c89d6..707c580 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index ba54524..0f4636e 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" -#include "opt_mac.h" #ifdef __i386__ #include "opt_npx.h" #endif diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index fb6b35d..ed48e54 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -91,8 +91,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/fcntl.h> diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 5e5695c..93da80d 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -32,8 +32,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/file.h> diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 2a2a3d0..89de07c 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sysvipc.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index a99cf4e..fa60acf 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sysvipc.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index b374b5c..b59aea5 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_sysvipc.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index ea53885..a5ddd88 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -32,7 +32,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_param.h" #include "opt_mbuf_stress_test.h" #include "opt_mbuf_profiling.h" diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c index 6fe83b0..3dc4238 100644 --- a/sys/kern/uipc_mbuf2.c +++ b/sys/kern/uipc_mbuf2.c @@ -65,8 +65,6 @@ __FBSDID("$FreeBSD$"); /*#define PULLDOWN_DEBUG*/ -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index da233a6..5ca13f8 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -34,7 +34,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_posix.h" #include <sys/param.h> diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 00fb438..3819154 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -55,8 +55,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/param.h> #include <sys/fcntl.h> #include <sys/file.h> diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 7341d3f..3367957 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -99,7 +99,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_zero.h" #include "opt_compat.h" diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 964547c..4dfaf84 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sctp.h" #include "opt_compat.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index c9e7d39..a8fe7ca 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/domain.h> diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index dfbff09..ce1fa33 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -35,8 +35,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index b75d364..5f024a8 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -29,8 +29,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/lock.h> diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index c76bd5b..7847f35 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 34a167f..19a6026 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include <security/mac/mac_framework.h> #include "opt_rootdevname.h" -#include "opt_mac.h" #define ROOTNAME "root_device" #define VFS_MOUNTARG_SIZE_MAX (1024 * 64) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 8d694f8..47a5046 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index a99d435..72a53f8 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 82527a6..702faae 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -37,8 +37,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/fcntl.h> |