From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 21:09:07 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EAF421065679;
	Sat, 30 Jan 2010 21:09:07 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DBECC8FC1C;
	Sat, 30 Jan 2010 21:09:07 +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 o0UL97mS009205;
	Sat, 30 Jan 2010 21:09:07 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UL97aB009203;
	Sat, 30 Jan 2010 21:09:07 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001302109.o0UL97aB009203@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 21:09:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203257 - projects/capabilities8/sys/sys
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 21:09:08 -0000

Author: rwatson
Date: Sat Jan 30 21:09:07 2010
New Revision: 203257
URL: http://svn.freebsd.org/changeset/base/203257

Log:
  Merge c173953 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Eliminate collision on capability sysctl flags due to new flags being
    added in SVN
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/sys/sys/sysctl.h

Modified: projects/capabilities8/sys/sys/sysctl.h
==============================================================================
--- projects/capabilities8/sys/sys/sysctl.h	Sat Jan 30 21:08:17 2010	(r203256)
+++ projects/capabilities8/sys/sys/sysctl.h	Sat Jan 30 21:09:07 2010	(r203257)
@@ -87,8 +87,8 @@ struct ctlname {
 #define CTLFLAG_MPSAFE	0x00040000	/* Handler is MP safe */
 #define CTLFLAG_VNET	0x00020000	/* Prisons with vnet can fiddle */
 #define CTLFLAG_RDTUN	(CTLFLAG_RD|CTLFLAG_TUN)
-#define CTLFLAG_CAPRD	0x00040000	/* Can be read in capability mode */
-#define CTLFLAG_CAPWR	0x00020000	/* Can be written in capability mode */
+#define CTLFLAG_CAPRD	0x00010000	/* Can be read in capability mode */
+#define CTLFLAG_CAPWR	0x00008000	/* Can be written in capability mode */
 #define CTLFLAG_CAPRW	(CTLFLAG_CAPRD|CTLFLAG_CAPWR)
 
 /*