From owner-p4-projects@FreeBSD.ORG  Mon Jun  8 20:44:52 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E175A1065675; Mon,  8 Jun 2009 20:44:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9E5F4106566C
	for <perforce@freebsd.org>; Mon,  8 Jun 2009 20:44:51 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B3EA8FC22
	for <perforce@freebsd.org>; Mon,  8 Jun 2009 20:44:51 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n58KipAm016724
	for <perforce@freebsd.org>; Mon, 8 Jun 2009 20:44:51 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n58KipIJ016722
	for perforce@freebsd.org; Mon, 8 Jun 2009 20:44:51 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 8 Jun 2009 20:44:51 GMT
Message-Id: <200906082044.n58KipIJ016722@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 163830 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 20:44:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=163830

Change 163830 by rwatson@rwatson_freebsd_capabilities on 2009/06/08 20:44:45

	Supplement existing privilege separation in dhclient using
	capability mode.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/dhclient.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/dhclient.c#4 (text+ko) ====

@@ -61,6 +61,8 @@
 
 #include <net80211/ieee80211_freebsd.h>
 
+#include <sys/capability.h>
+
 #ifndef _PATH_VAREMPTY
 #define	_PATH_VAREMPTY	"/var/empty"
 #endif
@@ -438,6 +440,9 @@
 	if (immediate_daemon)
 		go_daemon();
 
+	if (cap_enter() != 0 && errno != ENOSYS)
+		error("cap_enter");
+
 	ifi->client->state = S_INIT;
 	state_reboot(ifi);