diff options
author | rwatson <rwatson@FreeBSD.org> | 2014-03-16 11:04:44 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2014-03-16 11:04:44 +0000 |
commit | a400e9c00711b1982145fcf059c7562d8de06f1c (patch) | |
tree | c4e002e293230ad068a6ae83b2b3f3afed3e95e5 /tools/regression | |
parent | 33fdc14c0cd663baae9fad419e3f9cfe12578196 (diff) | |
download | FreeBSD-src-a400e9c00711b1982145fcf059c7562d8de06f1c.zip FreeBSD-src-a400e9c00711b1982145fcf059c7562d8de06f1c.tar.gz |
Update most userspace consumers of capability.h to use capsicum.h instead.
auditdistd is not updated as I will make the change upstream and then do a
vendor import sometime in the next week or two.
MFC after: 3 weeks
Diffstat (limited to 'tools/regression')
14 files changed, 14 insertions, 14 deletions
diff --git a/tools/regression/capsicum/libcapsicum/dns.c b/tools/regression/capsicum/libcapsicum/dns.c index 239c647..4426bf3 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 5e33b8a..dbffeaf 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 82ea8c0..23e81a3 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 38c686d..c72e842 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 c97203d..f37710d 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 1a38202..32037c3 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 753aa71..27d8589 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 02288ad..1ffac9a 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 5392756..d0c915c 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 1d12ebd..626abe7 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 0979fe7..8becee0 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 305d46a..2018edd 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 27410eb..284cf78 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 5ec6daf..a31b424 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> |