diff options
| author | rwatson <rwatson@FreeBSD.org> | 2014-03-16 11:04:44 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2014-03-16 11:04:44 +0000 |
| commit | a400e9c00711b1982145fcf059c7562d8de06f1c (patch) | |
| tree | c4e002e293230ad068a6ae83b2b3f3afed3e95e5 /sbin | |
| parent | 33fdc14c0cd663baae9fad419e3f9cfe12578196 (diff) | |
| download | FreeBSD-src-a400e9c00711b1982145fcf059c7562d8de06f1c.zip FreeBSD-src-a400e9c00711b1982145fcf059c7562d8de06f1c.tar.gz | |
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
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/casperd/casperd.c | 2 | ||||
| -rw-r--r-- | sbin/casperd/zygote.c | 2 | ||||
| -rw-r--r-- | sbin/dhclient/bpf.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dhclient.c | 4 | ||||
| -rw-r--r-- | sbin/hastd/subr.c | 2 | ||||
| -rw-r--r-- | sbin/ping/ping.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sbin/casperd/casperd.c b/sbin/casperd/casperd.c index f283709..4b9037b 100644 --- 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> diff --git a/sbin/casperd/zygote.c b/sbin/casperd/zygote.c index 8ca131a..fdc7ca1 100644 --- 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> diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c index 311bcc7..7c2e531 100644 --- 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> diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 90b53de..c43bda9 100644 --- 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> diff --git a/sbin/hastd/subr.c b/sbin/hastd/subr.c index 0e9930b..738e5f2 100644 --- 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 diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 4b01bb9..283c22b 100644 --- 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> |
