From d40b03aac6942c43927a5645db24e3b1ca8a041e Mon Sep 17 00:00:00 2001 From: rwatson Date: Thu, 19 Mar 2015 12:32:48 +0000 Subject: [PATCH] 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. git-svn-id: svn://svn.freebsd.org/base/stable/10@280250 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- contrib/tcpdump/tcpdump.c | 2 +- crypto/openssh/sandbox-capsicum.c | 2 +- lib/libc/gen/cap_sandboxed.c | 2 +- lib/libprocstat/libprocstat.c | 2 +- sbin/dhclient/bpf.c | 4 ++-- sbin/dhclient/dhclient.c | 4 ++-- sbin/hastd/subr.c | 2 +- tools/regression/capsicum/syscalls/cap_fcntls_limit.c | 2 +- tools/regression/capsicum/syscalls/cap_getmode.c | 2 +- tools/regression/capsicum/syscalls/cap_ioctls_limit.c | 2 +- tools/regression/security/cap_test/cap_test_capabilities.c | 2 +- tools/regression/security/cap_test/cap_test_capmode.c | 2 +- tools/regression/security/cap_test/cap_test_fcntl.c | 2 +- tools/regression/security/cap_test/cap_test_pdfork.c | 2 +- tools/regression/security/cap_test/cap_test_pdkill.c | 2 +- tools/regression/security/cap_test/cap_test_relative.c | 2 +- tools/regression/security/cap_test/cap_test_sysctl.c | 2 +- usr.bin/kdump/kdump.c | 2 +- usr.bin/kdump/mksubr | 6 +++--- usr.bin/procstat/procstat_files.c | 2 +- usr.bin/rwho/rwho.c | 2 +- usr.bin/uniq/uniq.c | 2 +- usr.sbin/ctld/kernel.c | 2 +- usr.sbin/iscsid/iscsid.c | 2 +- usr.sbin/rwhod/rwhod.c | 2 +- 25 files changed, 29 insertions(+), 29 deletions(-) diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c index afcc15214..d5dae1610 100644 --- a/contrib/tcpdump/tcpdump.c +++ b/contrib/tcpdump/tcpdump.c @@ -69,7 +69,7 @@ extern int SIZE_BUF; #include #include #ifdef __FreeBSD__ -#include +#include #include #include #include diff --git a/crypto/openssh/sandbox-capsicum.c b/crypto/openssh/sandbox-capsicum.c index fd88de0bf..5f41d5262 100644 --- a/crypto/openssh/sandbox-capsicum.c +++ b/crypto/openssh/sandbox-capsicum.c @@ -23,7 +23,7 @@ __RCSID("$FreeBSD$"); #include #include #include -#include +#include #include #include diff --git a/lib/libc/gen/cap_sandboxed.c b/lib/libc/gen/cap_sandboxed.c index baa9b3f78..ec2d4db33 100644 --- a/lib/libc/gen/cap_sandboxed.c +++ b/lib/libc/gen/cap_sandboxed.c @@ -30,7 +30,7 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #include #include diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index d8d39bb05..727419b71 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #define _KERNEL #include #include diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c index 311bcc7f8..7c2e53116 100644 --- a/sbin/dhclient/bpf.c +++ b/sbin/dhclient/bpf.c @@ -43,11 +43,11 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #include "dhcpd.h" #include "privsep.h" -#include +#include #include #include diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index f6052334f..e05912823 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -56,12 +56,12 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #include "dhcpd.h" #include "privsep.h" -#include +#include #include diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index 0e9930bcb..738e5f209 100644 --- a/sbin/hastd/subr.c +++ b/sbin/hastd/subr.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #ifdef HAVE_CAPSICUM -#include +#include #include #endif diff --git a/tools/regression/capsicum/syscalls/cap_fcntls_limit.c b/tools/regression/capsicum/syscalls/cap_fcntls_limit.c index c97203d47..f37710d9d 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 -#include +#include #include #include #include diff --git a/tools/regression/capsicum/syscalls/cap_getmode.c b/tools/regression/capsicum/syscalls/cap_getmode.c index 1a38202de..32037c3c1 100644 --- a/tools/regression/capsicum/syscalls/cap_getmode.c +++ b/tools/regression/capsicum/syscalls/cap_getmode.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include -#include +#include #include #include diff --git a/tools/regression/capsicum/syscalls/cap_ioctls_limit.c b/tools/regression/capsicum/syscalls/cap_ioctls_limit.c index 753aa7158..27d858965 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 -#include +#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_capabilities.c b/tools/regression/security/cap_test/cap_test_capabilities.c index 02288ad6b..1ffac9a51 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 -#include +#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_capmode.c b/tools/regression/security/cap_test/cap_test_capmode.c index 539275691..d0c915c61 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 -#include +#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_fcntl.c b/tools/regression/security/cap_test/cap_test_fcntl.c index 1d12ebdfd..626abe7a9 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 -#include +#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_pdfork.c b/tools/regression/security/cap_test/cap_test_pdfork.c index 0979fe73e..8becee04a 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 -#include +#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_pdkill.c b/tools/regression/security/cap_test/cap_test_pdkill.c index 305d46a79..2018eddbc 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 -#include +#include #include #include #include diff --git a/tools/regression/security/cap_test/cap_test_relative.c b/tools/regression/security/cap_test/cap_test_relative.c index 27410eb5e..284cf7852 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 -#include +#include #include #include diff --git a/tools/regression/security/cap_test/cap_test_sysctl.c b/tools/regression/security/cap_test/cap_test_sysctl.c index 5ec6dafe0..a31b42416 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 -#include +#include #include #include #include diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index d8fa9b4a7..37edd0cc5 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -46,7 +46,7 @@ extern int errno; #include #undef _KERNEL #include -#include +#include #include #define _KERNEL #include diff --git a/usr.bin/kdump/mksubr b/usr.bin/kdump/mksubr index c026d2a8e..f5b9132e1 100644 --- a/usr.bin/kdump/mksubr +++ b/usr.bin/kdump/mksubr @@ -190,7 +190,7 @@ cat <<_EOF_ #include #include #include -#include +#include #include #include @@ -451,7 +451,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" @@ -739,7 +739,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 103b8e17a..c88065f4a 100644 --- a/usr.bin/procstat/procstat_files.c +++ b/usr.bin/procstat/procstat_files.c @@ -27,7 +27,7 @@ */ #include -#include +#include #include #include #include diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c index 8c985f017..3fb0da5c3 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 __FBSDID("$FreeBSD$"); -#include +#include #include #include diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index 8e7f40fd1..7c1b0e3a0 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 +#include #include #include diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index 183aeeff2..9638613ee 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include #include diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index e5ddd4f74..a6feb6ab6 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include #include diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index 87a41667b..ff7a60a33 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 __FBSDID("$FreeBSD$"); -#include +#include #include #include #include -- 2.45.0