From owner-svn-src-all@FreeBSD.ORG  Sat Jul  2 15:41:23 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 499ED1065678;
	Sat,  2 Jul 2011 15:41:23 +0000 (UTC)
	(envelope-from jonathan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 39DEA8FC0A;
	Sat,  2 Jul 2011 15:41:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p62FfNn7046081;
	Sat, 2 Jul 2011 15:41:23 GMT (envelope-from jonathan@svn.freebsd.org)
Received: (from jonathan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p62FfN67046078;
	Sat, 2 Jul 2011 15:41:23 GMT (envelope-from jonathan@svn.freebsd.org)
Message-Id: <201107021541.p62FfN67046078@svn.freebsd.org>
From: Jonathan Anderson <jonathan@FreeBSD.org>
Date: Sat, 2 Jul 2011 15:41:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223723 - head/sys/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Jul 2011 15:41:23 -0000

Author: jonathan
Date: Sat Jul  2 15:41:22 2011
New Revision: 223723
URL: http://svn.freebsd.org/changeset/base/223723

Log:
  Define the CAPABILITIES kernel option.
  
  This option will enable Capsicum capabilities, which provide a fine-grained
  mask on operations that can be performed on file descriptors.
  
  Approved by: mentor (rwatson), re (Capsicum blanket ok)
  Sponsored by: Google Inc

Modified:
  head/sys/conf/NOTES
  head/sys/conf/options

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Sat Jul  2 13:54:20 2011	(r223722)
+++ head/sys/conf/NOTES	Sat Jul  2 15:41:22 2011	(r223723)
@@ -1162,7 +1162,8 @@ options 	MAC_STUB
 options 	MAC_TEST
 
 # Support for Capsicum
-options 	CAPABILITY_MODE
+options 	CAPABILITIES	# fine-grained rights on file descriptors
+options 	CAPABILITY_MODE	# sandboxes with no global namespace access
 
 
 #####################################################################

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Sat Jul  2 13:54:20 2011	(r223722)
+++ head/sys/conf/options	Sat Jul  2 15:41:22 2011	(r223723)
@@ -63,6 +63,7 @@ SYSCTL_DEBUG	opt_sysctl.h
 ADAPTIVE_LOCKMGRS
 ALQ
 AUDIT		opt_global.h
+CAPABILITIES	opt_capsicum.h
 CAPABILITY_MODE	opt_capsicum.h
 CODA_COMPAT_5	opt_coda.h
 COMPAT_43	opt_compat.h