diff options
94 files changed, 6 insertions, 115 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 54ab6a2..bb49e3f 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 6474d1e..afd30c8 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index dc8edf5..d1e1b32 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/blist.h> diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 479ccf3..4d21a32 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/dirent.h> diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index a4cdfcf..88e4fc2 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.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/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index f994314..62bd010 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.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/dirent.h> diff --git a/sys/conf/options b/sys/conf/options index 1d9a67b..c72b3d1 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -112,7 +112,7 @@ KSTACK_PAGES KTRACE KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV -MAC +MAC opt_global.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h MAC_IFOFF opt_dontuse.h diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c index ca4f79a..d0947b9 100644 --- a/sys/contrib/pf/net/pf.c +++ b/sys/contrib/pf/net/pf.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #endif #ifdef __FreeBSD__ -#include "opt_mac.h" #include "opt_bpf.h" #include "opt_pf.h" diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index 4041911..c4b9713 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -28,8 +28,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index d88f49c..ff86e36 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -34,8 +34,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" /* To set MNT_MULTILABEL. */ - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index c637ea8..46d7942 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -40,8 +40,6 @@ * mkdir: want it ? */ -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index e117955..b3efc05 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$"); #include <rpc/rpc.h> #include <rpc/rpcsec_gss.h> +#include <security/mac/mac_framework.h> + NFSDLOCKMUTEX; /* diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 69165e3..bfcbdcd 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -52,9 +52,7 @@ #include <sys/stat.h> #include <sys/resourcevar.h> -#ifdef MAC -#include <sys/mac.h> -#endif +#include <security/mac/mac_framework.h> #include <vm/uma.h> diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index a6bcbd2..87b563d 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kstack_pages.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index 7faf675..1906fd7 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -55,8 +55,6 @@ __FBSDID("$FreeBSD$"); * IBCS2 system calls that are implemented differently in BSD are * handled here. */ -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/dirent.h> 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> diff --git a/sys/net/bpf.c b/sys/net/bpf.c index b944e29..c74d09f 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bpf.h" -#include "opt_mac.h" #include "opt_netgraph.h" #include <sys/types.h> diff --git a/sys/net/if.c b/sys/net/if.c index ffff619..1a5dcd2 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -34,7 +34,6 @@ #include "opt_inet6.h" #include "opt_inet.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_carp.h" #include <sys/param.h> diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index 734acc5..d8a3313 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_natm.h" #include <sys/param.h> diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 19122d6..02ff422 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -35,7 +35,6 @@ #include "opt_inet6.h" #include "opt_ipx.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_netgraph.h" #include "opt_carp.h" #include "opt_mbuf_profiling.h" diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index 28f6e3a..9074bff 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -40,7 +40,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index a5e0b19..4f30db4 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -32,7 +32,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 50279a2..6405725 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -32,7 +32,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c index 99daf66..a6d25dc 100644 --- a/sys/net/if_iso88025subr.c +++ b/sys/net/if_iso88025subr.c @@ -43,7 +43,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index cc9251b..2bbccac 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -39,7 +39,6 @@ #include "opt_inet6.h" #include "opt_ipx.h" #include "opt_route.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index 1c2c649..911804e 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -76,7 +76,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index df965be..6b352e8 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -20,7 +20,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/priv.h> diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c index fc328d3..d682230 100644 --- a/sys/netatalk/aarp.c +++ b/sys/netatalk/aarp.c @@ -51,7 +51,6 @@ */ #include "opt_atalk.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c index d90b2e8..2e82a2a 100644 --- a/sys/netatalk/ddp_input.c +++ b/sys/netatalk/ddp_input.c @@ -49,8 +49,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" - #include <sys/param.h> #include <sys/kernel.h> #include <sys/lock.h> diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c index 9581094..203bc9f 100644 --- a/sys/netatalk/ddp_output.c +++ b/sys/netatalk/ddp_output.c @@ -23,8 +23,6 @@ /* $FreeBSD$ */ -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 734dd02..f0716d2 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_carp.h" #include <sys/param.h> diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index d7dcfc5..e4f2b5a 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -50,7 +50,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_route.h" #include <sys/param.h> diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 140f41a..a0d6f6d 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_ipsec.h" #include "opt_inet6.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 0894bfa4..0b72c65 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #if !defined(KLD_MODULE) #include "opt_inet.h" #include "opt_ipfw.h" -#include "opt_mac.h" #include "opt_sctp.h" #ifndef INET #error "IPDIVERT requires INET." diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index 65a2e26..760150a 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #endif #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include "opt_route.h" #include <sys/param.h> diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 8c2ef26..cfd27f0 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipsec.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index bb54b4d..bdc0c6d 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipstealth.h" #include "opt_ipsec.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_carp.h" #include <sys/param.h> diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index fdea118..65dc944 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" -#include "opt_mac.h" #include "opt_mrouting.h" #define _PIM_VT 1 diff --git a/sys/netinet/ip_options.c b/sys/netinet/ip_options.c index dbb7d81..b59d708 100644 --- a/sys/netinet/ip_options.c +++ b/sys/netinet/ip_options.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipstealth.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 65e06a0..eded15c 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipfw.h" #include "opt_ipsec.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_mbuf_stress_test.h" #include "opt_mpath.h" #include "opt_sctp.h" diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 0c3108d..806fc1d 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_route.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/jail.h> diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 674c77e..eecf2fb 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include "opt_tcpdebug.h" #include <sys/param.h> diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index d014fdd..3117fc3 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include "opt_tcpdebug.h" #include <sys/param.h> diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 3c65a54..489617b 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include "opt_tcpdebug.h" #include <sys/param.h> diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 2763183..033e506 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 5ee6087..4c0fe94 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_tcpdebug.h" #include <sys/param.h> diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index caeb2ae..33be911 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipfw.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/domain.h> diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index d0f333d..2f4e256 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.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/malloc.h> diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 800564c..051cd9b 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index ffcd996..ccfdb8f 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_route.h" #include <sys/param.h> diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 11dcf24..590e6d6 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/jail.h> diff --git a/sys/nfsserver/nfs_srvkrpc.c b/sys/nfsserver/nfs_srvkrpc.c index 2b3b48a..12f40c8 100644 --- a/sys/nfsserver/nfs_srvkrpc.c +++ b/sys/nfsserver/nfs_srvkrpc.c @@ -81,6 +81,8 @@ __FBSDID("$FreeBSD$"); #include <nfsserver/nfsrvcache.h> #include <nfsserver/nfs_fha.h> +#include <security/mac/mac_framework.h> + #ifndef NFS_LEGACYRPC static MALLOC_DEFINE(M_NFSSVC, "nfss_srvsock", "Nfs server structure"); diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index db48869..13679ef 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$"); * Socket operations for use by nfs */ -#include "opt_mac.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/jail.h> diff --git a/sys/security/audit/audit_syscalls.c b/sys/security/audit/audit_syscalls.c index bb1e707..1811660 100644 --- a/sys/security/audit/audit_syscalls.c +++ b/sys/security/audit/audit_syscalls.c @@ -30,8 +30,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include <sys/param.h> #include <sys/mount.h> #include <sys/namei.h> diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index c5c1328..7aae808 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -32,7 +32,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_quota.h" #include "opt_ufs.h" #include "opt_ffs.h" diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 49ced43..38c2543 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -37,7 +37,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_quota.h" #include "opt_suiddir.h" #include "opt_ufs.h" diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 6b58294..769a11d 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -69,7 +69,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_swap.h" #include "opt_vm.h" diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index c79a0f4..fb9bb5f1 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" -#include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> |
