From owner-svn-src-head@FreeBSD.ORG Fri Jun 5 14:55:27 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1717B106564A; Fri, 5 Jun 2009 14:55:27 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 00B268FC14; Fri, 5 Jun 2009 14:55:27 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n55EtQlc029185; Fri, 5 Jun 2009 14:55:26 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55EtMBc029090; Fri, 5 Jun 2009 14:55:22 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200906051455.n55EtMBc029090@svn.freebsd.org> From: Robert Watson Date: Fri, 5 Jun 2009 14:55:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193511 - in head/sys: compat/linux compat/svr4 conf contrib/pf/net fs/devfs fs/nfsserver fs/unionfs i386/i386 i386/ibcs2 kern net netatalk netinet netinet6 nfsserver security/audit ufs... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2009 14:55:27 -0000 Author: rwatson Date: Fri Jun 5 14:55:22 2009 New Revision: 193511 URL: http://svn.freebsd.org/changeset/base/193511 Log: 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 Modified: head/sys/compat/linux/linux_file.c head/sys/compat/linux/linux_getcwd.c head/sys/compat/linux/linux_misc.c head/sys/compat/linux/linux_stats.c head/sys/compat/svr4/svr4_fcntl.c head/sys/compat/svr4/svr4_misc.c head/sys/conf/options head/sys/contrib/pf/net/pf.c head/sys/fs/devfs/devfs_devs.c head/sys/fs/devfs/devfs_vfsops.c head/sys/fs/devfs/devfs_vnops.c head/sys/fs/nfsserver/nfs_nfsdkrpc.c head/sys/fs/unionfs/union_subr.c head/sys/i386/i386/sys_machdep.c head/sys/i386/ibcs2/ibcs2_misc.c head/sys/kern/init_main.c head/sys/kern/kern_acct.c head/sys/kern/kern_alq.c head/sys/kern/kern_environment.c head/sys/kern/kern_exec.c head/sys/kern/kern_exit.c head/sys/kern/kern_fork.c head/sys/kern/kern_jail.c head/sys/kern/kern_ktrace.c head/sys/kern/kern_linker.c head/sys/kern/kern_mbuf.c head/sys/kern/kern_priv.c head/sys/kern/kern_prot.c head/sys/kern/kern_shutdown.c head/sys/kern/kern_sysctl.c head/sys/kern/link_elf.c head/sys/kern/link_elf_obj.c head/sys/kern/subr_trap.c head/sys/kern/sys_pipe.c head/sys/kern/sys_socket.c head/sys/kern/sysv_msg.c head/sys/kern/sysv_sem.c head/sys/kern/sysv_shm.c head/sys/kern/uipc_mbuf.c head/sys/kern/uipc_mbuf2.c head/sys/kern/uipc_sem.c head/sys/kern/uipc_shm.c head/sys/kern/uipc_socket.c head/sys/kern/uipc_syscalls.c head/sys/kern/uipc_usrreq.c head/sys/kern/vfs_acl.c head/sys/kern/vfs_extattr.c head/sys/kern/vfs_lookup.c head/sys/kern/vfs_mount.c head/sys/kern/vfs_subr.c head/sys/kern/vfs_syscalls.c head/sys/kern/vfs_vnops.c head/sys/net/bpf.c head/sys/net/if.c head/sys/net/if_atmsubr.c head/sys/net/if_ethersubr.c head/sys/net/if_fddisubr.c head/sys/net/if_fwsubr.c head/sys/net/if_gif.c head/sys/net/if_iso88025subr.c head/sys/net/if_loop.c head/sys/net/if_stf.c head/sys/net/if_tun.c head/sys/netatalk/aarp.c head/sys/netatalk/ddp_input.c head/sys/netatalk/ddp_output.c head/sys/netinet/if_ether.c head/sys/netinet/igmp.c head/sys/netinet/in_pcb.c head/sys/netinet/ip_divert.c head/sys/netinet/ip_fw2.c head/sys/netinet/ip_icmp.c head/sys/netinet/ip_input.c head/sys/netinet/ip_mroute.c head/sys/netinet/ip_options.c head/sys/netinet/ip_output.c head/sys/netinet/raw_ip.c head/sys/netinet/tcp_input.c head/sys/netinet/tcp_output.c head/sys/netinet/tcp_subr.c head/sys/netinet/tcp_syncache.c head/sys/netinet/tcp_timewait.c head/sys/netinet/udp_usrreq.c head/sys/netinet6/frag6.c head/sys/netinet6/in6_pcb.c head/sys/netinet6/nd6.c head/sys/netinet6/udp6_usrreq.c head/sys/nfsserver/nfs_srvkrpc.c head/sys/nfsserver/nfs_srvsock.c head/sys/security/audit/audit_syscalls.c head/sys/ufs/ffs/ffs_vfsops.c head/sys/ufs/ufs/ufs_vnops.c head/sys/vm/swap_pager.c head/sys/vm/vm_mmap.c Modified: head/sys/compat/linux/linux_file.c ============================================================================== --- head/sys/compat/linux/linux_file.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/compat/linux/linux_file.c Fri Jun 5 14:55:22 2009 (r193511) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include #include Modified: head/sys/compat/linux/linux_getcwd.c ============================================================================== --- head/sys/compat/linux/linux_getcwd.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/compat/linux/linux_getcwd.c Fri Jun 5 14:55:22 2009 (r193511) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include #include Modified: head/sys/compat/linux/linux_misc.c ============================================================================== --- head/sys/compat/linux/linux_misc.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/compat/linux/linux_misc.c Fri Jun 5 14:55:22 2009 (r193511) @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include #include Modified: head/sys/compat/linux/linux_stats.c ============================================================================== --- head/sys/compat/linux/linux_stats.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/compat/linux/linux_stats.c Fri Jun 5 14:55:22 2009 (r193511) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_mac.h" #include #include Modified: head/sys/compat/svr4/svr4_fcntl.c ============================================================================== --- head/sys/compat/svr4/svr4_fcntl.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/compat/svr4/svr4_fcntl.c Fri Jun 5 14:55:22 2009 (r193511) @@ -32,8 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/compat/svr4/svr4_misc.c ============================================================================== --- head/sys/compat/svr4/svr4_misc.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/compat/svr4/svr4_misc.c Fri Jun 5 14:55:22 2009 (r193511) @@ -35,8 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/conf/options Fri Jun 5 14:55:22 2009 (r193511) @@ -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 Modified: head/sys/contrib/pf/net/pf.c ============================================================================== --- head/sys/contrib/pf/net/pf.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/contrib/pf/net/pf.c Fri Jun 5 14:55:22 2009 (r193511) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #endif #ifdef __FreeBSD__ -#include "opt_mac.h" #include "opt_bpf.h" #include "opt_pf.h" Modified: head/sys/fs/devfs/devfs_devs.c ============================================================================== --- head/sys/fs/devfs/devfs_devs.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/fs/devfs/devfs_devs.c Fri Jun 5 14:55:22 2009 (r193511) @@ -28,8 +28,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" - #include #include #include Modified: head/sys/fs/devfs/devfs_vfsops.c ============================================================================== --- head/sys/fs/devfs/devfs_vfsops.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/fs/devfs/devfs_vfsops.c Fri Jun 5 14:55:22 2009 (r193511) @@ -34,8 +34,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" /* To set MNT_MULTILABEL. */ - #include #include #include Modified: head/sys/fs/devfs/devfs_vnops.c ============================================================================== --- head/sys/fs/devfs/devfs_vnops.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/fs/devfs/devfs_vnops.c Fri Jun 5 14:55:22 2009 (r193511) @@ -40,8 +40,6 @@ * mkdir: want it ? */ -#include "opt_mac.h" - #include #include #include Modified: head/sys/fs/nfsserver/nfs_nfsdkrpc.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdkrpc.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/fs/nfsserver/nfs_nfsdkrpc.c Fri Jun 5 14:55:22 2009 (r193511) @@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + NFSDLOCKMUTEX; /* Modified: head/sys/fs/unionfs/union_subr.c ============================================================================== --- head/sys/fs/unionfs/union_subr.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/fs/unionfs/union_subr.c Fri Jun 5 14:55:22 2009 (r193511) @@ -52,9 +52,7 @@ #include #include -#ifdef MAC -#include -#endif +#include #include Modified: head/sys/i386/i386/sys_machdep.c ============================================================================== --- head/sys/i386/i386/sys_machdep.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/i386/i386/sys_machdep.c Fri Jun 5 14:55:22 2009 (r193511) @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kstack_pages.h" -#include "opt_mac.h" #include #include Modified: head/sys/i386/ibcs2/ibcs2_misc.c ============================================================================== --- head/sys/i386/ibcs2/ibcs2_misc.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/i386/ibcs2/ibcs2_misc.c Fri Jun 5 14:55:22 2009 (r193511) @@ -55,8 +55,6 @@ __FBSDID("$FreeBSD$"); * IBCS2 system calls that are implemented differently in BSD are * handled here. */ -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/init_main.c ============================================================================== --- head/sys/kern/init_main.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/init_main.c Fri Jun 5 14:55:22 2009 (r193511) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_init_path.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/kern_acct.c ============================================================================== --- head/sys/kern/kern_acct.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_acct.c Fri Jun 5 14:55:22 2009 (r193511) @@ -70,8 +70,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/kern_alq.c ============================================================================== --- head/sys/kern/kern_alq.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_alq.c Fri Jun 5 14:55:22 2009 (r193511) @@ -27,8 +27,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/kern_environment.c ============================================================================== --- head/sys/kern/kern_environment.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_environment.c Fri Jun 5 14:55:22 2009 (r193511) @@ -37,8 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/kern_exec.c ============================================================================== --- head/sys/kern/kern_exec.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_exec.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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 Modified: head/sys/kern/kern_exit.c ============================================================================== --- head/sys/kern/kern_exit.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_exit.c Fri Jun 5 14:55:22 2009 (r193511) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/kern_fork.c ============================================================================== --- head/sys/kern/kern_fork.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_fork.c Fri Jun 5 14:55:22 2009 (r193511) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/kern_jail.c ============================================================================== --- head/sys/kern/kern_jail.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_jail.c Fri Jun 5 14:55:22 2009 (r193511) @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/kern_ktrace.c ============================================================================== --- head/sys/kern/kern_ktrace.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_ktrace.c Fri Jun 5 14:55:22 2009 (r193511) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/kern_linker.c ============================================================================== --- head/sys/kern/kern_linker.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_linker.c Fri Jun 5 14:55:22 2009 (r193511) @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/kern_mbuf.c ============================================================================== --- head/sys/kern/kern_mbuf.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_mbuf.c Fri Jun 5 14:55:22 2009 (r193511) @@ -28,7 +28,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_param.h" #include Modified: head/sys/kern/kern_priv.c ============================================================================== --- head/sys/kern/kern_priv.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_priv.c Fri Jun 5 14:55:22 2009 (r193511) @@ -29,7 +29,6 @@ */ #include "opt_kdtrace.h" -#include "opt_mac.h" #include __FBSDID("$FreeBSD$"); Modified: head/sys/kern/kern_prot.c ============================================================================== --- head/sys/kern/kern_prot.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_prot.c Fri Jun 5 14:55:22 2009 (r193511) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/kern_shutdown.c ============================================================================== --- head/sys/kern/kern_shutdown.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_shutdown.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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" Modified: head/sys/kern/kern_sysctl.c ============================================================================== --- head/sys/kern/kern_sysctl.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/kern_sysctl.c Fri Jun 5 14:55:22 2009 (r193511) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/link_elf.c ============================================================================== --- head/sys/kern/link_elf.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/link_elf.c Fri Jun 5 14:55:22 2009 (r193511) @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_gdb.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/link_elf_obj.c ============================================================================== --- head/sys/kern/link_elf_obj.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/link_elf_obj.c Fri Jun 5 14:55:22 2009 (r193511) @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/subr_trap.c ============================================================================== --- head/sys/kern/subr_trap.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/subr_trap.c Fri Jun 5 14:55:22 2009 (r193511) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" -#include "opt_mac.h" #ifdef __i386__ #include "opt_npx.h" #endif Modified: head/sys/kern/sys_pipe.c ============================================================================== --- head/sys/kern/sys_pipe.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/sys_pipe.c Fri Jun 5 14:55:22 2009 (r193511) @@ -91,8 +91,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/sys_socket.c ============================================================================== --- head/sys/kern/sys_socket.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/sys_socket.c Fri Jun 5 14:55:22 2009 (r193511) @@ -32,8 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/sysv_msg.c ============================================================================== --- head/sys/kern/sysv_msg.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/sysv_msg.c Fri Jun 5 14:55:22 2009 (r193511) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sysvipc.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/sysv_sem.c ============================================================================== --- head/sys/kern/sysv_sem.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/sysv_sem.c Fri Jun 5 14:55:22 2009 (r193511) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sysvipc.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/sysv_shm.c ============================================================================== --- head/sys/kern/sysv_shm.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/sysv_shm.c Fri Jun 5 14:55:22 2009 (r193511) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_sysvipc.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/uipc_mbuf.c ============================================================================== --- head/sys/kern/uipc_mbuf.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/uipc_mbuf.c Fri Jun 5 14:55:22 2009 (r193511) @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_param.h" #include "opt_mbuf_stress_test.h" #include "opt_mbuf_profiling.h" Modified: head/sys/kern/uipc_mbuf2.c ============================================================================== --- head/sys/kern/uipc_mbuf2.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/uipc_mbuf2.c Fri Jun 5 14:55:22 2009 (r193511) @@ -65,8 +65,6 @@ __FBSDID("$FreeBSD$"); /*#define PULLDOWN_DEBUG*/ -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/uipc_sem.c ============================================================================== --- head/sys/kern/uipc_sem.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/uipc_sem.c Fri Jun 5 14:55:22 2009 (r193511) @@ -34,7 +34,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_posix.h" #include Modified: head/sys/kern/uipc_shm.c ============================================================================== --- head/sys/kern/uipc_shm.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/uipc_shm.c Fri Jun 5 14:55:22 2009 (r193511) @@ -55,8 +55,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/uipc_socket.c ============================================================================== --- head/sys/kern/uipc_socket.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/uipc_socket.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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" Modified: head/sys/kern/uipc_syscalls.c ============================================================================== --- head/sys/kern/uipc_syscalls.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/uipc_syscalls.c Fri Jun 5 14:55:22 2009 (r193511) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sctp.h" #include "opt_compat.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/uipc_usrreq.c ============================================================================== --- head/sys/kern/uipc_usrreq.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/uipc_usrreq.c Fri Jun 5 14:55:22 2009 (r193511) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/vfs_acl.c ============================================================================== --- head/sys/kern/vfs_acl.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/vfs_acl.c Fri Jun 5 14:55:22 2009 (r193511) @@ -35,8 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/vfs_extattr.c ============================================================================== --- head/sys/kern/vfs_extattr.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/vfs_extattr.c Fri Jun 5 14:55:22 2009 (r193511) @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/kern/vfs_lookup.c ============================================================================== --- head/sys/kern/vfs_lookup.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/vfs_lookup.c Fri Jun 5 14:55:22 2009 (r193511) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/vfs_mount.c ============================================================================== --- head/sys/kern/vfs_mount.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/vfs_mount.c Fri Jun 5 14:55:22 2009 (r193511) @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include #include "opt_rootdevname.h" -#include "opt_mac.h" #define ROOTNAME "root_device" #define VFS_MOUNTARG_SIZE_MAX (1024 * 64) Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/vfs_subr.c Fri Jun 5 14:55:22 2009 (r193511) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/vfs_syscalls.c ============================================================================== --- head/sys/kern/vfs_syscalls.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/vfs_syscalls.c Fri Jun 5 14:55:22 2009 (r193511) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_mac.h" #include #include Modified: head/sys/kern/vfs_vnops.c ============================================================================== --- head/sys/kern/vfs_vnops.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/kern/vfs_vnops.c Fri Jun 5 14:55:22 2009 (r193511) @@ -37,8 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/net/bpf.c ============================================================================== --- head/sys/net/bpf.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/bpf.c Fri Jun 5 14:55:22 2009 (r193511) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_bpf.h" -#include "opt_mac.h" #include "opt_netgraph.h" #include Modified: head/sys/net/if.c ============================================================================== --- head/sys/net/if.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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 Modified: head/sys/net/if_atmsubr.c ============================================================================== --- head/sys/net/if_atmsubr.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if_atmsubr.c Fri Jun 5 14:55:22 2009 (r193511) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_natm.h" #include Modified: head/sys/net/if_ethersubr.c ============================================================================== --- head/sys/net/if_ethersubr.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if_ethersubr.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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" Modified: head/sys/net/if_fddisubr.c ============================================================================== --- head/sys/net/if_fddisubr.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if_fddisubr.c Fri Jun 5 14:55:22 2009 (r193511) @@ -40,7 +40,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_mac.h" #include #include Modified: head/sys/net/if_fwsubr.c ============================================================================== --- head/sys/net/if_fwsubr.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if_fwsubr.c Fri Jun 5 14:55:22 2009 (r193511) @@ -32,7 +32,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include Modified: head/sys/net/if_gif.c ============================================================================== --- head/sys/net/if_gif.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if_gif.c Fri Jun 5 14:55:22 2009 (r193511) @@ -32,7 +32,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include Modified: head/sys/net/if_iso88025subr.c ============================================================================== --- head/sys/net/if_iso88025subr.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if_iso88025subr.c Fri Jun 5 14:55:22 2009 (r193511) @@ -43,7 +43,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_mac.h" #include #include Modified: head/sys/net/if_loop.c ============================================================================== --- head/sys/net/if_loop.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if_loop.c Fri Jun 5 14:55:22 2009 (r193511) @@ -39,7 +39,6 @@ #include "opt_inet6.h" #include "opt_ipx.h" #include "opt_route.h" -#include "opt_mac.h" #include #include Modified: head/sys/net/if_stf.c ============================================================================== --- head/sys/net/if_stf.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if_stf.c Fri Jun 5 14:55:22 2009 (r193511) @@ -76,7 +76,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include Modified: head/sys/net/if_tun.c ============================================================================== --- head/sys/net/if_tun.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/net/if_tun.c Fri Jun 5 14:55:22 2009 (r193511) @@ -20,7 +20,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" -#include "opt_mac.h" #include #include Modified: head/sys/netatalk/aarp.c ============================================================================== --- head/sys/netatalk/aarp.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netatalk/aarp.c Fri Jun 5 14:55:22 2009 (r193511) @@ -51,7 +51,6 @@ */ #include "opt_atalk.h" -#include "opt_mac.h" #include #include Modified: head/sys/netatalk/ddp_input.c ============================================================================== --- head/sys/netatalk/ddp_input.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netatalk/ddp_input.c Fri Jun 5 14:55:22 2009 (r193511) @@ -49,8 +49,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" - #include #include #include Modified: head/sys/netatalk/ddp_output.c ============================================================================== --- head/sys/netatalk/ddp_output.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netatalk/ddp_output.c Fri Jun 5 14:55:22 2009 (r193511) @@ -23,8 +23,6 @@ /* $FreeBSD$ */ -#include "opt_mac.h" - #include #include #include Modified: head/sys/netinet/if_ether.c ============================================================================== --- head/sys/netinet/if_ether.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/if_ether.c Fri Jun 5 14:55:22 2009 (r193511) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_route.h" -#include "opt_mac.h" #include "opt_carp.h" #include Modified: head/sys/netinet/igmp.c ============================================================================== --- head/sys/netinet/igmp.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/igmp.c Fri Jun 5 14:55:22 2009 (r193511) @@ -50,7 +50,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_route.h" #include Modified: head/sys/netinet/in_pcb.c ============================================================================== --- head/sys/netinet/in_pcb.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/in_pcb.c Fri Jun 5 14:55:22 2009 (r193511) @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_ipsec.h" #include "opt_inet6.h" -#include "opt_mac.h" #include #include Modified: head/sys/netinet/ip_divert.c ============================================================================== --- head/sys/netinet/ip_divert.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/ip_divert.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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." Modified: head/sys/netinet/ip_fw2.c ============================================================================== --- head/sys/netinet/ip_fw2.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/ip_fw2.c Fri Jun 5 14:55:22 2009 (r193511) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #endif #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include "opt_route.h" #include Modified: head/sys/netinet/ip_icmp.c ============================================================================== --- head/sys/netinet/ip_icmp.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/ip_icmp.c Fri Jun 5 14:55:22 2009 (r193511) @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipsec.h" -#include "opt_mac.h" #include #include Modified: head/sys/netinet/ip_input.c ============================================================================== --- head/sys/netinet/ip_input.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/ip_input.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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 Modified: head/sys/netinet/ip_mroute.c ============================================================================== --- head/sys/netinet/ip_mroute.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/ip_mroute.c Fri Jun 5 14:55:22 2009 (r193511) @@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" -#include "opt_mac.h" #include "opt_mrouting.h" #define _PIM_VT 1 Modified: head/sys/netinet/ip_options.c ============================================================================== --- head/sys/netinet/ip_options.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/ip_options.c Fri Jun 5 14:55:22 2009 (r193511) @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipstealth.h" -#include "opt_mac.h" #include #include Modified: head/sys/netinet/ip_output.c ============================================================================== --- head/sys/netinet/ip_output.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/ip_output.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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" Modified: head/sys/netinet/raw_ip.c ============================================================================== --- head/sys/netinet/raw_ip.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/raw_ip.c Fri Jun 5 14:55:22 2009 (r193511) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_route.h" -#include "opt_mac.h" #include #include Modified: head/sys/netinet/tcp_input.c ============================================================================== --- head/sys/netinet/tcp_input.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/tcp_input.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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 Modified: head/sys/netinet/tcp_output.c ============================================================================== --- head/sys/netinet/tcp_output.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/tcp_output.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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 Modified: head/sys/netinet/tcp_subr.c ============================================================================== --- head/sys/netinet/tcp_subr.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/tcp_subr.c Fri Jun 5 14:55:22 2009 (r193511) @@ -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 Modified: head/sys/netinet/tcp_syncache.c ============================================================================== --- head/sys/netinet/tcp_syncache.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/tcp_syncache.c Fri Jun 5 14:55:22 2009 (r193511) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include #include Modified: head/sys/netinet/tcp_timewait.c ============================================================================== --- head/sys/netinet/tcp_timewait.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/tcp_timewait.c Fri Jun 5 14:55:22 2009 (r193511) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_tcpdebug.h" #include Modified: head/sys/netinet/udp_usrreq.c ============================================================================== --- head/sys/netinet/udp_usrreq.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet/udp_usrreq.c Fri Jun 5 14:55:22 2009 (r193511) @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ipfw.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include #include Modified: head/sys/netinet6/frag6.c ============================================================================== --- head/sys/netinet6/frag6.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet6/frag6.c Fri Jun 5 14:55:22 2009 (r193511) @@ -32,8 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/netinet6/in6_pcb.c ============================================================================== --- head/sys/netinet6/in6_pcb.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet6/in6_pcb.c Fri Jun 5 14:55:22 2009 (r193511) @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include #include Modified: head/sys/netinet6/nd6.c ============================================================================== --- head/sys/netinet6/nd6.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet6/nd6.c Fri Jun 5 14:55:22 2009 (r193511) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_mac.h" #include "opt_route.h" #include Modified: head/sys/netinet6/udp6_usrreq.c ============================================================================== --- head/sys/netinet6/udp6_usrreq.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/netinet6/udp6_usrreq.c Fri Jun 5 14:55:22 2009 (r193511) @@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" -#include "opt_mac.h" #include #include Modified: head/sys/nfsserver/nfs_srvkrpc.c ============================================================================== --- head/sys/nfsserver/nfs_srvkrpc.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/nfsserver/nfs_srvkrpc.c Fri Jun 5 14:55:22 2009 (r193511) @@ -81,6 +81,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #ifndef NFS_LEGACYRPC static MALLOC_DEFINE(M_NFSSVC, "nfss_srvsock", "Nfs server structure"); Modified: head/sys/nfsserver/nfs_srvsock.c ============================================================================== --- head/sys/nfsserver/nfs_srvsock.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/nfsserver/nfs_srvsock.c Fri Jun 5 14:55:22 2009 (r193511) @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$"); * Socket operations for use by nfs */ -#include "opt_mac.h" - #include #include #include Modified: head/sys/security/audit/audit_syscalls.c ============================================================================== --- head/sys/security/audit/audit_syscalls.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/security/audit/audit_syscalls.c Fri Jun 5 14:55:22 2009 (r193511) @@ -30,8 +30,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" - #include #include #include Modified: head/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- head/sys/ufs/ffs/ffs_vfsops.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/ufs/ffs/ffs_vfsops.c Fri Jun 5 14:55:22 2009 (r193511) @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_quota.h" #include "opt_ufs.h" #include "opt_ffs.h" Modified: head/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- head/sys/ufs/ufs/ufs_vnops.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/ufs/ufs/ufs_vnops.c Fri Jun 5 14:55:22 2009 (r193511) @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_quota.h" #include "opt_suiddir.h" #include "opt_ufs.h" Modified: head/sys/vm/swap_pager.c ============================================================================== --- head/sys/vm/swap_pager.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/vm/swap_pager.c Fri Jun 5 14:55:22 2009 (r193511) @@ -69,7 +69,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_mac.h" #include "opt_swap.h" #include "opt_vm.h" Modified: head/sys/vm/vm_mmap.c ============================================================================== --- head/sys/vm/vm_mmap.c Fri Jun 5 14:31:03 2009 (r193510) +++ head/sys/vm/vm_mmap.c Fri Jun 5 14:55:22 2009 (r193511) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" -#include "opt_mac.h" #include #include