diff options
| author | rwatson <rwatson@FreeBSD.org> | 2015-03-19 12:32:48 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2015-03-19 12:32:48 +0000 |
| commit | bcbbcda0f2e4af8b9dd5b88b8aee78fb712e107e (patch) | |
| tree | e5b4ae536a72fe4a7a095f75635897247049ed5f /tools | |
| parent | b9b03fb7e3cdf29ad38ea78cca31b5416c7ad569 (diff) | |
| download | FreeBSD-src-bcbbcda0f2e4af8b9dd5b88b8aee78fb712e107e.zip FreeBSD-src-bcbbcda0f2e4af8b9dd5b88b8aee78fb712e107e.tar.gz | |
Merge an applicable subset of r263234 from HEAD to stable/10:
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.
Note that a significant fraction does not apply, as FreeBSD 10 doesn't
contain a Capsicumised ping, casperd, libcasper, etc. When these features
are merged, the capsicum.h change will need to be merged with them.
Sponsored by: Google, Inc.
Diffstat (limited to 'tools')
10 files changed, 10 insertions, 10 deletions
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> |
