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
2009-06-05 14:55:22 +00:00 · 2009-06-05 14:55:22 +00:00 · bcf11e8d00
commit bcf11e8d00
parent 88a9a9a61c
94 changed files with 6 additions and 115 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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"

--- 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>
--- 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>
--- 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>
--- 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;

 /*
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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$");
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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"

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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)
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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."
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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");
--- 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>
--- 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>
--- 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"
--- 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"
--- 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"

--- 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>