From owner-svn-src-projects@FreeBSD.ORG  Sun Jan 31 11:20:28 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 2101C106566C;
	Sun, 31 Jan 2010 11:20:28 +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 103258FC14;
	Sun, 31 Jan 2010 11:20:28 +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 o0VBKRIo008240;
	Sun, 31 Jan 2010 11:20:27 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0VBKRN7008237;
	Sun, 31 Jan 2010 11:20:27 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001311120.o0VBKRN7008237@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 31 Jan 2010 11:20:27 +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: r203273 - in projects/capabilities8/sys: amd64/conf
	i386/conf
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: Sun, 31 Jan 2010 11:20:28 -0000

Author: rwatson
Date: Sun Jan 31 11:20:27 2010
New Revision: 203273
URL: http://svn.freebsd.org/changeset/base/203273

Log:
  Merge c174011 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Add INVARIANTS to CAPABILITIES configuration -- in 9.x, this has
    no effect, but we use the same config file in 8.x where INVARIANTS
    is not the default.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/sys/amd64/conf/CAPABILITIES
  projects/capabilities8/sys/i386/conf/CAPABILITIES

Modified: projects/capabilities8/sys/amd64/conf/CAPABILITIES
==============================================================================
--- projects/capabilities8/sys/amd64/conf/CAPABILITIES	Sun Jan 31 08:16:37 2010	(r203272)
+++ projects/capabilities8/sys/amd64/conf/CAPABILITIES	Sun Jan 31 11:20:27 2010	(r203273)
@@ -4,6 +4,7 @@ ident CAPABILITIES
 options CAPABILITIES
 options PROCDESC
 options KDTRACE_HOOKS
+options INVARIANTS
 options WITNESS
 options KDB
 options DDB

Modified: projects/capabilities8/sys/i386/conf/CAPABILITIES
==============================================================================
--- projects/capabilities8/sys/i386/conf/CAPABILITIES	Sun Jan 31 08:16:37 2010	(r203272)
+++ projects/capabilities8/sys/i386/conf/CAPABILITIES	Sun Jan 31 11:20:27 2010	(r203273)
@@ -4,6 +4,7 @@ ident CAPABILITIES
 options CAPABILITIES
 options PROCDESC
 options KDTRACE_HOOKS
+options INVARIANTS
 options WITNESS
 options KDB
 options DDB