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
2014-03-16 11:04:44 +00:00 · 2014-03-16 11:04:44 +00:00 · b881b8be1d
commit b881b8be1d
parent 4a14441044
33 changed files with 37 additions and 37 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>

--- 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>

--- 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

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 {
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>