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 /usr.sbin | |
| 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 'usr.sbin')
| -rw-r--r-- | usr.sbin/ctld/kernel.c | 2 | ||||
| -rw-r--r-- | usr.sbin/iscsid/iscsid.c | 2 | ||||
| -rw-r--r-- | usr.sbin/rwhod/rwhod.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index 183aeef..9638613 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #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> diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index e5ddd4f..a6feb6a 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #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> diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index 87a4166..ff7a60a3 100644 --- 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> |
