From bcbbcda0f2e4af8b9dd5b88b8aee78fb712e107e Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Thu, 19 Mar 2015 12:32:48 +0000
Subject: 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.
---
 sbin/dhclient/bpf.c      | 4 ++--
 sbin/dhclient/dhclient.c | 4 ++--
 sbin/hastd/subr.c        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sbin')

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>
 
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
 
-- 
cgit v1.1