From owner-svn-src-all@FreeBSD.ORG  Sat Jun 25 12:37:06 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 A13C8106566B;
	Sat, 25 Jun 2011 12:37:06 +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 91C358FC0C;
	Sat, 25 Jun 2011 12:37:06 +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 p5PCb6TN006944;
	Sat, 25 Jun 2011 12:37:06 GMT
	(envelope-from jonathan@svn.freebsd.org)
Received: (from jonathan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5PCb6Rv006942;
	Sat, 25 Jun 2011 12:37:06 GMT
	(envelope-from jonathan@svn.freebsd.org)
Message-Id: <201106251237.p5PCb6Rv006942@svn.freebsd.org>
From: Jonathan Anderson <jonathan@FreeBSD.org>
Date: Sat, 25 Jun 2011 12:37:06 +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: r223533 - head/sys/kern
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, 25 Jun 2011 12:37:06 -0000

Author: jonathan
Date: Sat Jun 25 12:37:06 2011
New Revision: 223533
URL: http://svn.freebsd.org/changeset/base/223533

Log:
  Remove redundant Capsicum sysctl.
  
  Since we're now declaring FEATURE(security_capabilities), there's no need for an explicit SYSCTL_NODE.
  
  Approved by: rwatson

Modified:
  head/sys/kern/sys_capability.c

Modified: head/sys/kern/sys_capability.c
==============================================================================
--- head/sys/kern/sys_capability.c	Sat Jun 25 11:21:23 2011	(r223532)
+++ head/sys/kern/sys_capability.c	Sat Jun 25 12:37:06 2011	(r223533)
@@ -64,13 +64,6 @@ __FBSDID("$FreeBSD$");
 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
- * compiled into the kernel.
- */
-SYSCTL_NODE(_security, OID_AUTO, capabilities, CTLFLAG_RW, 0, "Capsicum");
-
-/*
  * System call to enter capability mode for the process.
  */
 int