From owner-svn-src-all@FreeBSD.ORG  Fri Mar  4 09:03:55 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 6C346106564A;
	Fri,  4 Mar 2011 09:03:54 +0000 (UTC)
	(envelope-from netchild@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A1978FC0C;
	Fri,  4 Mar 2011 09:03:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2493sUE017565;
	Fri, 4 Mar 2011 09:03:54 GMT (envelope-from netchild@svn.freebsd.org)
Received: (from netchild@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2493sh8017562;
	Fri, 4 Mar 2011 09:03:54 GMT (envelope-from netchild@svn.freebsd.org)
Message-Id: <201103040903.p2493sh8017562@svn.freebsd.org>
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Fri, 4 Mar 2011 09:03:54 +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: r219258 - in head/sys: kern security/mac
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: Fri, 04 Mar 2011 09:03:55 -0000

Author: netchild
Date: Fri Mar  4 09:03:54 2011
New Revision: 219258
URL: http://svn.freebsd.org/changeset/base/219258

Log:
  - Add a FEATURE for capsicum (security_capabilities).
  - Rename mac FEATURE to security_mac.
  
  Discussed with:	rwatson

Modified:
  head/sys/kern/sys_capability.c
  head/sys/security/mac/mac_syscalls.c

Modified: head/sys/kern/sys_capability.c
==============================================================================
--- head/sys/kern/sys_capability.c	Fri Mar  4 07:01:45 2011	(r219257)
+++ head/sys/kern/sys_capability.c	Fri Mar  4 09:03:54 2011	(r219258)
@@ -61,6 +61,8 @@ __FBSDID("$FreeBSD$");
 
 #ifdef CAPABILITIES
 
+FEATURE(security_capabilities, "Capsicum Capability Mode");
+
 /*
  * We don't currently have any MIB entries for sysctls, but we do expose
  * security.capabilities so that it's easy to tell if options CAPABILITIES is

Modified: head/sys/security/mac/mac_syscalls.c
==============================================================================
--- head/sys/security/mac/mac_syscalls.c	Fri Mar  4 07:01:45 2011	(r219257)
+++ head/sys/security/mac/mac_syscalls.c	Fri Mar  4 09:03:54 2011	(r219258)
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
 
 #ifdef MAC
 
-FEATURE(mac, "Mandatory Access Control Framework support");
+FEATURE(security_mac, "Mandatory Access Control Framework support");
 
 int
 __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)