diff options
| author | rwatson <rwatson@FreeBSD.org> | 2015-03-19 12:32:48 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2015-03-19 12:32:48 +0000 |
| commit | bcbbcda0f2e4af8b9dd5b88b8aee78fb712e107e (patch) | |
| tree | e5b4ae536a72fe4a7a095f75635897247049ed5f /sbin/dhclient | |
| parent | b9b03fb7e3cdf29ad38ea78cca31b5416c7ad569 (diff) | |
| download | FreeBSD-src-bcbbcda0f2e4af8b9dd5b88b8aee78fb712e107e.zip FreeBSD-src-bcbbcda0f2e4af8b9dd5b88b8aee78fb712e107e.tar.gz | |
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.
Diffstat (limited to 'sbin/dhclient')
| -rw-r--r-- | sbin/dhclient/bpf.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dhclient.c | 4 |
2 files changed, 4 insertions, 4 deletions
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 f605233..e059128 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> |
