]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
Merge an applicable subset of r263234 from HEAD to stable/10:
authorrwatson <rwatson@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 19 Mar 2015 12:32:48 +0000 (12:32 +0000)
committerrwatson <rwatson@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 19 Mar 2015 12:32:48 +0000 (12:32 +0000)
commitd40b03aac6942c43927a5645db24e3b1ca8a041e
treee5b4ae536a72fe4a7a095f75635897247049ed5f
parent2e7e22e9421cb2d0a18ae7b8cdee0fe42494c50a
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
25 files changed:
contrib/tcpdump/tcpdump.c
crypto/openssh/sandbox-capsicum.c
lib/libc/gen/cap_sandboxed.c
lib/libprocstat/libprocstat.c
sbin/dhclient/bpf.c
sbin/dhclient/dhclient.c
sbin/hastd/subr.c
tools/regression/capsicum/syscalls/cap_fcntls_limit.c
tools/regression/capsicum/syscalls/cap_getmode.c
tools/regression/capsicum/syscalls/cap_ioctls_limit.c
tools/regression/security/cap_test/cap_test_capabilities.c
tools/regression/security/cap_test/cap_test_capmode.c
tools/regression/security/cap_test/cap_test_fcntl.c
tools/regression/security/cap_test/cap_test_pdfork.c
tools/regression/security/cap_test/cap_test_pdkill.c
tools/regression/security/cap_test/cap_test_relative.c
tools/regression/security/cap_test/cap_test_sysctl.c
usr.bin/kdump/kdump.c
usr.bin/kdump/mksubr
usr.bin/procstat/procstat_files.c
usr.bin/rwho/rwho.c
usr.bin/uniq/uniq.c
usr.sbin/ctld/kernel.c
usr.sbin/iscsid/iscsid.c
usr.sbin/rwhod/rwhod.c