diff options
33 files changed, 37 insertions, 37 deletions
diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c index f1e696f42b5b..b2124a65aa15 100644 --- a/contrib/tcpdump/tcpdump.c +++ b/contrib/tcpdump/tcpdump.c @@ -69,7 +69,7 @@ extern int SIZE_BUF; #include <string.h> #include <limits.h> #ifdef __FreeBSD__ -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/ioccom.h> #include <sys/types.h> #include <sys/sysctl.h> diff --git a/crypto/openssh/sandbox-capsicum.c b/crypto/openssh/sandbox-capsicum.c index 6064514ef858..1e1c15c93ac2 100644 --- a/crypto/openssh/sandbox-capsicum.c +++ b/crypto/openssh/sandbox-capsicum.c @@ -22,7 +22,7 @@ #include <sys/param.h> #include <sys/time.h> #include <sys/resource.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <errno.h> #include <stdarg.h> diff --git a/lib/libc/gen/cap_sandboxed.c b/lib/libc/gen/cap_sandboxed.c index baa9b3f7886e..ec2d4db334a7 100644 --- a/lib/libc/gen/cap_sandboxed.c +++ b/lib/libc/gen/cap_sandboxed.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <assert.h> #include <errno.h> diff --git a/lib/libcasper/libcasper.c b/lib/libcasper/libcasper.c index 68d283210e7f..7545baa47f6d 100644 --- a/lib/libcasper/libcasper.c +++ b/lib/libcasper/libcasper.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/stat.h> diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index d8d39bb05da0..727419b71d7a 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include <sys/conf.h> #include <sys/ksem.h> #include <sys/mman.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #define _KERNEL #include <sys/mount.h> #include <sys/pipe.h> diff --git a/sbin/casperd/casperd.c b/sbin/casperd/casperd.c index f283709e2f17..4b9037b40e38 100644 --- a/sbin/casperd/casperd.c +++ b/sbin/casperd/casperd.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/queue.h> #include <sys/socket.h> #include <sys/stat.h> diff --git a/sbin/casperd/zygote.c b/sbin/casperd/zygote.c index 8ca131ad8833..fdc7ca115ff5 100644 --- a/sbin/casperd/zygote.c +++ b/sbin/casperd/zygote.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/procdesc.h> #include <sys/socket.h> diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c index 311bcc7f8120..7c2e53116cd0 100644 --- a/sbin/dhclient/bpf.c +++ b/sbin/dhclient/bpf.c @@ -43,11 +43,11 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include "dhcpd.h" #include "privsep.h" -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/ioctl.h> #include <sys/uio.h> diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 90b53dedb2bf..c43bda9f480c 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -56,12 +56,12 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include "dhcpd.h" #include "privsep.h" -#include <sys/capability.h> +#include <sys/capsicum.h> #include <net80211/ieee80211_freebsd.h> diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index 0e9930bcb7fa..738e5f20947e 100644 --- a/sbin/hastd/subr.c +++ b/sbin/hastd/subr.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/jail.h> #include <sys/stat.h> #ifdef HAVE_CAPSICUM -#include <sys/capability.h> +#include <sys/capsicum.h> #include <geom/gate/g_gate.h> #endif diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 4b01bb9781b0..283c22bb42ef 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$"); */ #include <sys/param.h> /* NB: we rely on this for <sys/types.h> */ -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/socket.h> #include <sys/sysctl.h> #include <sys/time.h> diff --git a/tools/regression/capsicum/libcapsicum/dns.c b/tools/regression/capsicum/libcapsicum/dns.c index 239c6475983b..4426bf31e6f3 100644 --- a/tools/regression/capsicum/libcapsicum/dns.c +++ b/tools/regression/capsicum/libcapsicum/dns.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <arpa/inet.h> #include <netinet/in.h> diff --git a/tools/regression/capsicum/libcapsicum/grp.c b/tools/regression/capsicum/libcapsicum/grp.c index 5e33b8acbe8e..dbffeaf2c72e 100644 --- a/tools/regression/capsicum/libcapsicum/grp.c +++ b/tools/regression/capsicum/libcapsicum/grp.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <assert.h> #include <err.h> diff --git a/tools/regression/capsicum/libcapsicum/pwd.c b/tools/regression/capsicum/libcapsicum/pwd.c index 82ea8c04d9e7..23e81a3dd923 100644 --- a/tools/regression/capsicum/libcapsicum/pwd.c +++ b/tools/regression/capsicum/libcapsicum/pwd.c @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <assert.h> #include <err.h> diff --git a/tools/regression/capsicum/libcapsicum/sysctl.c b/tools/regression/capsicum/libcapsicum/sysctl.c index 38c686dfcd8f..c72e842dfd74 100644 --- a/tools/regression/capsicum/libcapsicum/sysctl.c +++ b/tools/regression/capsicum/libcapsicum/sysctl.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/sysctl.h> #include <assert.h> diff --git a/tools/regression/capsicum/syscalls/cap_fcntls_limit.c b/tools/regression/capsicum/syscalls/cap_fcntls_limit.c index c97203d4775b..f37710d9df12 100644 --- a/tools/regression/capsicum/syscalls/cap_fcntls_limit.c +++ b/tools/regression/capsicum/syscalls/cap_fcntls_limit.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/procdesc.h> #include <sys/socket.h> #include <sys/wait.h> diff --git a/tools/regression/capsicum/syscalls/cap_getmode.c b/tools/regression/capsicum/syscalls/cap_getmode.c index 1a38202defcb..32037c3c13de 100644 --- a/tools/regression/capsicum/syscalls/cap_getmode.c +++ b/tools/regression/capsicum/syscalls/cap_getmode.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/procdesc.h> #include <sys/wait.h> diff --git a/tools/regression/capsicum/syscalls/cap_ioctls_limit.c b/tools/regression/capsicum/syscalls/cap_ioctls_limit.c index 753aa7158c70..27d85896533f 100644 --- a/tools/regression/capsicum/syscalls/cap_ioctls_limit.c +++ b/tools/regression/capsicum/syscalls/cap_ioctls_limit.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/ioctl.h> #include <sys/procdesc.h> #include <sys/socket.h> diff --git a/tools/regression/security/cap_test/cap_test_capabilities.c b/tools/regression/security/cap_test/cap_test_capabilities.c index 02288ad6bd58..1ffac9a519cf 100644 --- a/tools/regression/security/cap_test/cap_test_capabilities.c +++ b/tools/regression/security/cap_test/cap_test_capabilities.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/errno.h> #include <sys/mman.h> #include <sys/mount.h> diff --git a/tools/regression/security/cap_test/cap_test_capmode.c b/tools/regression/security/cap_test/cap_test_capmode.c index 539275691fc5..d0c915c61327 100644 --- a/tools/regression/security/cap_test/cap_test_capmode.c +++ b/tools/regression/security/cap_test/cap_test_capmode.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/errno.h> #include <sys/mman.h> #include <sys/mount.h> diff --git a/tools/regression/security/cap_test/cap_test_fcntl.c b/tools/regression/security/cap_test/cap_test_fcntl.c index 1d12ebdfdb4d..626abe7a95b6 100644 --- a/tools/regression/security/cap_test/cap_test_fcntl.c +++ b/tools/regression/security/cap_test/cap_test_fcntl.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/errno.h> #include <sys/ipc.h> #include <sys/mman.h> diff --git a/tools/regression/security/cap_test/cap_test_pdfork.c b/tools/regression/security/cap_test/cap_test_pdfork.c index 0979fe73ea90..8becee04a1a8 100644 --- a/tools/regression/security/cap_test/cap_test_pdfork.c +++ b/tools/regression/security/cap_test/cap_test_pdfork.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsium.h> #include <sys/errno.h> #include <sys/procdesc.h> #include <sys/resource.h> diff --git a/tools/regression/security/cap_test/cap_test_pdkill.c b/tools/regression/security/cap_test/cap_test_pdkill.c index 305d46a797f2..2018eddbc394 100644 --- a/tools/regression/security/cap_test/cap_test_pdkill.c +++ b/tools/regression/security/cap_test/cap_test_pdkill.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/errno.h> #include <sys/procdesc.h> #include <sys/resource.h> diff --git a/tools/regression/security/cap_test/cap_test_relative.c b/tools/regression/security/cap_test/cap_test_relative.c index 27410eb5eef2..284cf7852c6c 100644 --- a/tools/regression/security/cap_test/cap_test_relative.c +++ b/tools/regression/security/cap_test/cap_test_relative.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/errno.h> #include <err.h> diff --git a/tools/regression/security/cap_test/cap_test_sysctl.c b/tools/regression/security/cap_test/cap_test_sysctl.c index 5ec6dafe086c..a31b4241670e 100644 --- a/tools/regression/security/cap_test/cap_test_sysctl.c +++ b/tools/regression/security/cap_test/cap_test_sysctl.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/errno.h> #include <sys/sysctl.h> #include <sys/wait.h> diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index d18918fa8221..45c4eb998aa8 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -46,7 +46,7 @@ extern int errno; #include <sys/errno.h> #undef _KERNEL #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/errno.h> #define _KERNEL #include <sys/time.h> diff --git a/usr.bin/kdump/mksubr b/usr.bin/kdump/mksubr index 1859086af1c8..d8d803fa9256 100644 --- a/usr.bin/kdump/mksubr +++ b/usr.bin/kdump/mksubr @@ -187,7 +187,7 @@ cat <<_EOF_ #include <sys/shm.h> #include <nfsserver/nfs.h> #include <ufs/ufs/quota.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <vm/vm.h> #include <vm/vm_param.h> @@ -448,7 +448,7 @@ _EOF_ auto_or_type "accessmodename" "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+" "sys/unistd.h" auto_switch_type "acltypename" "ACL_TYPE_[A-Z4_]+[[:space:]]+0x[0-9]+" "sys/acl.h" -auto_or_type "capfcntlname" "CAP_FCNTL_[A-Z]+[[:space:]]+\(1" "sys/capability.h" +auto_or_type "capfcntlname" "CAP_FCNTL_[A-Z]+[[:space:]]+\(1" "sys/capsicum.h" auto_switch_type "extattrctlname" "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h" auto_switch_type "fadvisebehavname" "POSIX_FADV_[A-Z]+[[:space:]]+[0-9]+" "sys/fcntl.h" auto_or_type "flagsname" "O_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/fcntl.h" @@ -679,7 +679,7 @@ cat <<_EOF_ _EOF_ egrep '#define[[:space:]]+CAP_[A-Z_]+[[:space:]]+CAPRIGHT\([0-9],[[:space:]]+0x[0-9]{16}ULL\)' \ - $include_dir/sys/capability.h | \ + $include_dir/sys/capsicum.h | \ sed -E 's/[ ]+/ /g' | \ awk -F '[ \(,\)]' ' BEGIN { diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c index 484dc2db7508..af4f11f8f6e9 100644 --- a/usr.bin/procstat/procstat_files.c +++ b/usr.bin/procstat/procstat_files.c @@ -27,7 +27,7 @@ */ #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/socket.h> #include <sys/sysctl.h> #include <sys/un.h> diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c index 8c985f0170d1..3fb0da5c3f95 100644 --- a/usr.bin/rwho/rwho.c +++ b/usr.bin/rwho/rwho.c @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rwho.c 8.1 (Berkeley) 6/6/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/param.h> #include <sys/file.h> diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index 8e7f40fd14c4..7c1b0e3a0ea0 100644 --- a/usr.bin/uniq/uniq.c +++ b/usr.bin/uniq/uniq.c @@ -44,7 +44,7 @@ static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ -#include <sys/capability.h> +#include <sys/capsicum.h> #include <ctype.h> #include <err.h> diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index 4796a6819721..012dc7cd2636 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -43,7 +43,7 @@ #include <sys/queue.h> #include <sys/callout.h> #include <sys/sbuf.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <assert.h> #include <bsdxml.h> #include <ctype.h> diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index 7504eb9227f0..25588dc7ed9f 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -35,7 +35,7 @@ #include <sys/param.h> #include <sys/linker.h> #include <sys/socket.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/wait.h> #include <assert.h> #include <errno.h> diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index a29aee1a85bc..30a4ae857d2c 100644 --- a/usr.sbin/rwhod/rwhod.c +++ b/usr.sbin/rwhod/rwhod.c @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/param.h> #include <sys/socket.h> #include <sys/stat.h> |