Date: Sun, 16 Mar 2014 11:04:45 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263234 - in head: contrib/tcpdump crypto/openssh lib/libc/gen lib/libcasper lib/libprocstat sbin/casperd sbin/dhclient sbin/hastd sbin/ping tools/regression/capsicum/libcapsicum tools/... Message-ID: <201403161104.s2GB4jgP020411@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rwatson Date: Sun Mar 16 11:04:44 2014 New Revision: 263234 URL: http://svnweb.freebsd.org/changeset/base/263234 Log: 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 Modified: head/contrib/tcpdump/tcpdump.c head/crypto/openssh/sandbox-capsicum.c head/lib/libc/gen/cap_sandboxed.c head/lib/libcasper/libcasper.c head/lib/libprocstat/libprocstat.c head/sbin/casperd/casperd.c head/sbin/casperd/zygote.c head/sbin/dhclient/bpf.c head/sbin/dhclient/dhclient.c head/sbin/hastd/subr.c head/sbin/ping/ping.c head/tools/regression/capsicum/libcapsicum/dns.c head/tools/regression/capsicum/libcapsicum/grp.c head/tools/regression/capsicum/libcapsicum/pwd.c head/tools/regression/capsicum/libcapsicum/sysctl.c head/tools/regression/capsicum/syscalls/cap_fcntls_limit.c head/tools/regression/capsicum/syscalls/cap_getmode.c head/tools/regression/capsicum/syscalls/cap_ioctls_limit.c head/tools/regression/security/cap_test/cap_test_capabilities.c head/tools/regression/security/cap_test/cap_test_capmode.c head/tools/regression/security/cap_test/cap_test_fcntl.c head/tools/regression/security/cap_test/cap_test_pdfork.c head/tools/regression/security/cap_test/cap_test_pdkill.c head/tools/regression/security/cap_test/cap_test_relative.c head/tools/regression/security/cap_test/cap_test_sysctl.c head/usr.bin/kdump/kdump.c head/usr.bin/kdump/mksubr head/usr.bin/procstat/procstat_files.c head/usr.bin/rwho/rwho.c head/usr.bin/uniq/uniq.c head/usr.sbin/ctld/kernel.c head/usr.sbin/iscsid/iscsid.c head/usr.sbin/rwhod/rwhod.c Modified: head/contrib/tcpdump/tcpdump.c ============================================================================== --- head/contrib/tcpdump/tcpdump.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/contrib/tcpdump/tcpdump.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/crypto/openssh/sandbox-capsicum.c ============================================================================== --- head/crypto/openssh/sandbox-capsicum.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/crypto/openssh/sandbox-capsicum.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/lib/libc/gen/cap_sandboxed.c ============================================================================== --- head/lib/libc/gen/cap_sandboxed.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/lib/libc/gen/cap_sandboxed.c Sun Mar 16 11:04:44 2014 (r263234) @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <assert.h> #include <errno.h> Modified: head/lib/libcasper/libcasper.c ============================================================================== --- head/lib/libcasper/libcasper.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/lib/libcasper/libcasper.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/lib/libprocstat/libprocstat.c ============================================================================== --- head/lib/libprocstat/libprocstat.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/lib/libprocstat/libprocstat.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/sbin/casperd/casperd.c ============================================================================== --- head/sbin/casperd/casperd.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/sbin/casperd/casperd.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/sbin/casperd/zygote.c ============================================================================== --- head/sbin/casperd/zygote.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/sbin/casperd/zygote.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/sbin/dhclient/bpf.c ============================================================================== --- head/sbin/dhclient/bpf.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/sbin/dhclient/bpf.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/sbin/dhclient/dhclient.c ============================================================================== --- head/sbin/dhclient/dhclient.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/sbin/dhclient/dhclient.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/sbin/hastd/subr.c ============================================================================== --- head/sbin/hastd/subr.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/sbin/hastd/subr.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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 Modified: head/sbin/ping/ping.c ============================================================================== --- head/sbin/ping/ping.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/sbin/ping/ping.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/capsicum/libcapsicum/dns.c ============================================================================== --- head/tools/regression/capsicum/libcapsicum/dns.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/capsicum/libcapsicum/dns.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/capsicum/libcapsicum/grp.c ============================================================================== --- head/tools/regression/capsicum/libcapsicum/grp.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/capsicum/libcapsicum/grp.c Sun Mar 16 11:04:44 2014 (r263234) @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <assert.h> #include <err.h> Modified: head/tools/regression/capsicum/libcapsicum/pwd.c ============================================================================== --- head/tools/regression/capsicum/libcapsicum/pwd.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/capsicum/libcapsicum/pwd.c Sun Mar 16 11:04:44 2014 (r263234) @@ -30,7 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <assert.h> #include <err.h> Modified: head/tools/regression/capsicum/libcapsicum/sysctl.c ============================================================================== --- head/tools/regression/capsicum/libcapsicum/sysctl.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/capsicum/libcapsicum/sysctl.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/capsicum/syscalls/cap_fcntls_limit.c ============================================================================== --- head/tools/regression/capsicum/syscalls/cap_fcntls_limit.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/capsicum/syscalls/cap_fcntls_limit.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/capsicum/syscalls/cap_getmode.c ============================================================================== --- head/tools/regression/capsicum/syscalls/cap_getmode.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/capsicum/syscalls/cap_getmode.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/capsicum/syscalls/cap_ioctls_limit.c ============================================================================== --- head/tools/regression/capsicum/syscalls/cap_ioctls_limit.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/capsicum/syscalls/cap_ioctls_limit.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/security/cap_test/cap_test_capabilities.c ============================================================================== --- head/tools/regression/security/cap_test/cap_test_capabilities.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/security/cap_test/cap_test_capabilities.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/security/cap_test/cap_test_capmode.c ============================================================================== --- head/tools/regression/security/cap_test/cap_test_capmode.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/security/cap_test/cap_test_capmode.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/security/cap_test/cap_test_fcntl.c ============================================================================== --- head/tools/regression/security/cap_test/cap_test_fcntl.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/security/cap_test/cap_test_fcntl.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/security/cap_test/cap_test_pdfork.c ============================================================================== --- head/tools/regression/security/cap_test/cap_test_pdfork.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/security/cap_test/cap_test_pdfork.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/security/cap_test/cap_test_pdkill.c ============================================================================== --- head/tools/regression/security/cap_test/cap_test_pdkill.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/security/cap_test/cap_test_pdkill.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/security/cap_test/cap_test_relative.c ============================================================================== --- head/tools/regression/security/cap_test/cap_test_relative.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/security/cap_test/cap_test_relative.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/tools/regression/security/cap_test/cap_test_sysctl.c ============================================================================== --- head/tools/regression/security/cap_test/cap_test_sysctl.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/tools/regression/security/cap_test/cap_test_sysctl.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/usr.bin/kdump/kdump.c ============================================================================== --- head/usr.bin/kdump/kdump.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/usr.bin/kdump/kdump.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/usr.bin/kdump/mksubr ============================================================================== --- head/usr.bin/kdump/mksubr Sun Mar 16 10:55:57 2014 (r263233) +++ head/usr.bin/kdump/mksubr Sun Mar 16 11:04:44 2014 (r263234) @@ -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 { Modified: head/usr.bin/procstat/procstat_files.c ============================================================================== --- head/usr.bin/procstat/procstat_files.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/usr.bin/procstat/procstat_files.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/usr.bin/rwho/rwho.c ============================================================================== --- head/usr.bin/rwho/rwho.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/usr.bin/rwho/rwho.c Sun Mar 16 11:04:44 2014 (r263234) @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rwho.c 8.1 ( #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/param.h> #include <sys/file.h> Modified: head/usr.bin/uniq/uniq.c ============================================================================== --- head/usr.bin/uniq/uniq.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/usr.bin/uniq/uniq.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/usr.sbin/ctld/kernel.c ============================================================================== --- head/usr.sbin/ctld/kernel.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/usr.sbin/ctld/kernel.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/usr.sbin/iscsid/iscsid.c ============================================================================== --- head/usr.sbin/iscsid/iscsid.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/usr.sbin/iscsid/iscsid.c Sun Mar 16 11:04:44 2014 (r263234) @@ -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> Modified: head/usr.sbin/rwhod/rwhod.c ============================================================================== --- head/usr.sbin/rwhod/rwhod.c Sun Mar 16 10:55:57 2014 (r263233) +++ head/usr.sbin/rwhod/rwhod.c Sun Mar 16 11:04:44 2014 (r263234) @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rwhod.c 8.1 #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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403161104.s2GB4jgP020411>