diff options
67 files changed, 69 insertions, 69 deletions
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index 3561c16..26f38a2 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/malloc.h> diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index 3dd8f7a..2b955d0 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/fcntl.h> #include <sys/clock.h> diff --git a/sys/arm/arm/sys_machdep.c b/sys/arm/arm/sys_machdep.c index 0b667f8..e860e5d 100644 --- a/sys/arm/arm/sys_machdep.c +++ b/sys/arm/arm/sys_machdep.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/proc.h> #include <sys/sysproto.h> #include <sys/syscall.h> diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c index dfabd32..c74f8ef 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.c +++ b/sys/cam/ctl/ctl_frontend_iscsi.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/condvar.h> #include <sys/file.h> #include <sys/kernel.h> diff --git a/sys/cddl/compat/opensolaris/sys/file.h b/sys/cddl/compat/opensolaris/sys/file.h index 5f83082..f9349fd 100644 --- a/sys/cddl/compat/opensolaris/sys/file.h +++ b/sys/cddl/compat/opensolaris/sys/file.h @@ -36,7 +36,7 @@ #ifdef _KERNEL typedef struct file file_t; -#include <sys/capability.h> +#include <sys/capsicum.h> static __inline file_t * getf(int fd, cap_rights_t *rightsp) diff --git a/sys/compat/freebsd32/freebsd32_capability.c b/sys/compat/freebsd32/freebsd32_capability.c index 27c83c4..2aee10b 100644 --- a/sys/compat/freebsd32/freebsd32_capability.c +++ b/sys/compat/freebsd32/freebsd32_capability.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/filedesc.h> #include <sys/malloc.h> #include <sys/proc.h> diff --git a/sys/compat/freebsd32/freebsd32_ioctl.c b/sys/compat/freebsd32/freebsd32_ioctl.c index 1f90e58..39380a2 100644 --- a/sys/compat/freebsd32/freebsd32_ioctl.c +++ b/sys/compat/freebsd32/freebsd32_ioctl.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/cdio.h> #include <sys/fcntl.h> #include <sys/filio.h> diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 749c91d..e7cbb65 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/bus.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/clock.h> #include <sys/exec.h> #include <sys/fcntl.h> diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index a6b1d35..e56e61f 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/dirent.h> #include <sys/fcntl.h> diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 48afc09..166ffce 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/cdio.h> #include <sys/dvdio.h> #include <sys/conf.h> diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 7a8ed68..43b255d 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/limits.h> diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index 8d0b715..c604675 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> #include <sys/file.h> #include <sys/filedesc.h> diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c index b953e72..c92fd98 100644 --- a/sys/compat/svr4/svr4_filio.c +++ b/sys/compat/svr4/svr4_filio.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/proc.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/filio.h> #include <sys/lock.h> diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c index a8c8c8c..7cc01cc 100644 --- a/sys/compat/svr4/svr4_ioctl.c +++ b/sys/compat/svr4/svr4_ioctl.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/proc.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/fcntl.h> diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 4888698..4005ce4 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/dirent.h> #include <sys/fcntl.h> #include <sys/filedesc.h> diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index 6348b9b..91c393f 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/filedesc.h> #include <sys/filio.h> diff --git a/sys/dev/aac/aac_linux.c b/sys/dev/aac/aac_linux.c index 591dfbb..71a20ff 100644 --- a/sys/dev/aac/aac_linux.c +++ b/sys/dev/aac/aac_linux.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/sys/dev/aacraid/aacraid_linux.c b/sys/dev/aacraid/aacraid_linux.c index e58d0a4..10dd11a 100644 --- a/sys/dev/aacraid/aacraid_linux.c +++ b/sys/dev/aacraid/aacraid_linux.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #if __FreeBSD_version >= 900000 -#include <sys/capability.h> +#include <sys/capsicum.h> #endif #include <sys/systm.h> #include <sys/conf.h> diff --git a/sys/dev/amr/amr_linux.c b/sys/dev/amr/amr_linux.c index 5b1a17f..10fef5c 100644 --- a/sys/dev/amr/amr_linux.c +++ b/sys/dev/amr/amr_linux.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/sys/dev/filemon/filemon.c b/sys/dev/filemon/filemon.c index e3fda18..c711e3d 100644 --- a/sys/dev/filemon/filemon.c +++ b/sys/dev/filemon/filemon.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <sys/uio.h> #if __FreeBSD_version >= 900041 -#include <sys/capability.h> +#include <sys/capsicum.h> #endif #include "filemon.h" diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c index a60e096..c9b8aea 100644 --- a/sys/dev/hwpmc/hwpmc_logging.c +++ b/sys/dev/hwpmc/hwpmc_logging.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/kernel.h> #include <sys/kthread.h> diff --git a/sys/dev/ipmi/ipmi_linux.c b/sys/dev/ipmi/ipmi_linux.c index b6b38f2..13d4bda 100644 --- a/sys/dev/ipmi/ipmi_linux.c +++ b/sys/dev/ipmi/ipmi_linux.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/sys/dev/iscsi/icl.c b/sys/dev/iscsi/icl.c index 5739028..eeb9333 100644 --- a/sys/dev/iscsi/icl.c +++ b/sys/dev/iscsi/icl.c @@ -35,7 +35,7 @@ */ #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/condvar.h> #include <sys/conf.h> #include <sys/file.h> diff --git a/sys/dev/iscsi/icl_proxy.c b/sys/dev/iscsi/icl_proxy.c index 41e64c3..a5401a3 100644 --- a/sys/dev/iscsi/icl_proxy.c +++ b/sys/dev/iscsi/icl_proxy.c @@ -69,7 +69,7 @@ #ifdef ICL_KERNEL_PROXY #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/condvar.h> #include <sys/conf.h> #include <sys/kernel.h> diff --git a/sys/dev/iscsi_initiator/iscsi.c b/sys/dev/iscsi_initiator/iscsi.c index fd621bd..cd66a36 100644 --- a/sys/dev/iscsi_initiator/iscsi.c +++ b/sys/dev/iscsi_initiator/iscsi.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include "opt_iscsi_initiator.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/conf.h> diff --git a/sys/dev/mfi/mfi_linux.c b/sys/dev/mfi/mfi_linux.c index 429d496..c0082f7 100644 --- a/sys/dev/mfi/mfi_linux.c +++ b/sys/dev/mfi/mfi_linux.c @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/sys/dev/tdfx/tdfx_linux.c b/sys/dev/tdfx/tdfx_linux.c index fa39ab1..8a6399f 100644 --- a/sys/dev/tdfx/tdfx_linux.c +++ b/sys/dev/tdfx/tdfx_linux.c @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index b976504..a263225 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -40,7 +40,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/dirent.h> #include <sys/filedesc.h> diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index 0b4f19b..7388745 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include <sys/errno.h> #include <sys/param.h> #include <sys/kernel.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/filedesc.h> #include <sys/uio.h> diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 0b85353..8529c76 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" -#include <sys/capability.h> +#include <sys/capsicum.h> /* * generally, I don't like #includes inside .h files, but it seems to diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 21d302f..e36843c 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> /* * Functions that perform the vfs operations required by the routines in diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index 836423d..83cb699 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include "opt_kstack_pages.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> #include <sys/lock.h> #include <sys/malloc.h> diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c index d061b79..d2489df 100644 --- a/sys/i386/ibcs2/ibcs2_fcntl.c +++ b/sys/i386/ibcs2/ibcs2_fcntl.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/filedesc.h> diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c index 03fa5f6..3275303 100644 --- a/sys/i386/ibcs2/ibcs2_ioctl.c +++ b/sys/i386/ibcs2/ibcs2_ioctl.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/consio.h> #include <sys/fcntl.h> #include <sys/file.h> diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index 28cd83c..0eeb6de 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/dirent.h> #include <sys/fcntl.h> #include <sys/filedesc.h> diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 2d79204..5d69729 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/fcntl.h> #include <sys/imgact.h> diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index f6da68e..d5ec365 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include "opt_core.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/exec.h> #include <sys/fcntl.h> #include <sys/imgact.h> diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 3cb265a..2bf7382 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/domain.h> #include <sys/fcntl.h> diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 72386e0..b3fb23d 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/mutex.h> diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 9f4ceac..b5754be4 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -33,9 +33,9 @@ __FBSDID("$FreeBSD$"); #include "opt_vm.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/eventhandler.h> #include <sys/lock.h> #include <sys/mutex.h> diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 3ac6c33..cce0428 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/eventhandler.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index d4b722a..007ea03 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> #include <sys/fcntl.h> #include <sys/kernel.h> diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 6aa3475..b405779 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <sys/signalvar.h> #include <sys/vnode.h> #include <sys/acct.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/condvar.h> #include <sys/event.h> #include <sys/fcntl.h> diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index d1cbbb4..fec4aea 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/fail.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/malloc.h> diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c index ce41f4a..1504435 100644 --- a/sys/kern/subr_capability.c +++ b/sys/kern/subr_capability.c @@ -36,13 +36,13 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> #include <machine/stdarg.h> #else /* !_KERNEL */ #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <assert.h> #include <stdarg.h> diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index c06661e..a234bc2 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/ktr.h> #ifdef KTRACE #include <sys/uio.h> diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 07d63f8..cfc3ed7 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/bus.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/mutex.h> diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c index 7a82017..e4a42f7 100644 --- a/sys/kern/sys_capability.c +++ b/sys/kern/sys_capability.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/kernel.h> diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index f8fafb7..8163e3d 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/filedesc.h> #include <sys/filio.h> #include <sys/fcntl.h> diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index 0801fbf..a7dea80 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/filedesc.h> diff --git a/sys/kern/tty.c b/sys/kern/tty.c index a6cc746..1923499 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/cons.h> #include <sys/fcntl.h> diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 20efbe0..8ddf356 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/limits.h> #include <sys/buf.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/dirent.h> #include <sys/event.h> #include <sys/eventhandler.h> diff --git a/sys/kern/uipc_sem.c b/sys/kern/uipc_sem.c index f641654..b957d9b 100644 --- a/sys/kern/uipc_sem.c +++ b/sys/kern/uipc_sem.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include "opt_posix.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/condvar.h> #include <sys/fcntl.h> #include <sys/file.h> diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index bb414e1..030ee12 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/filedesc.h> diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 9420dfd..5b60e5b 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/condvar.h> #include <sys/kernel.h> #include <sys/lock.h> diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 87322da..90a815c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/domain.h> #include <sys/fcntl.h> #include <sys/malloc.h> /* XXX must be before <sys/file.h> */ diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index 362792b..93626fb 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 7f9f881..b47d713 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/bio.h> #include <sys/buf.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/eventhandler.h> #include <sys/sysproto.h> #include <sys/filedesc.h> diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index bc7b942..24935ce 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/lock.h> #include <sys/mount.h> #include <sys/mutex.h> diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 9c45a3b..00dd496 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/jail.h> #include <sys/lock.h> diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index f680d43..8481fb4 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/bio.h> #include <sys/buf.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/disk.h> #include <sys/sysent.h> #include <sys/malloc.h> diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c index 279ae67..394bbd0 100644 --- a/sys/netsmb/smb_dev.c +++ b/sys/netsmb/smb_dev.c @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/module.h> #include <sys/systm.h> #include <sys/conf.h> diff --git a/sys/nfsserver/nfs_srvkrpc.c b/sys/nfsserver/nfs_srvkrpc.c index 123bbba..8bd045a 100644 --- a/sys/nfsserver/nfs_srvkrpc.c +++ b/sys/nfsserver/nfs_srvkrpc.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include "opt_kgssapi.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/kernel.h> diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 6405586..f084ea4 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include "opt_mac.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/kernel.h> #include <sys/lock.h> diff --git a/sys/sparc64/sparc64/sys_machdep.c b/sys/sparc64/sparc64/sys_machdep.c index 9c9163f..102cee4 100644 --- a/sys/sparc64/sparc64/sys_machdep.c +++ b/sys/sparc64/sparc64/sys_machdep.c @@ -30,7 +30,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 4890bd0..69f3e99 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #include "opt_quota.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> #include <sys/bio.h> #include <sys/buf.h> diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 17f8cad..272491e 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/mutex.h> |
