From owner-p4-projects@FreeBSD.ORG Fri Jan 21 13:39:03 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D818410656A9; Fri, 21 Jan 2011 13:39:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99EBD10656A4 for ; Fri, 21 Jan 2011 13:39:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 427D28FC14 for ; Fri, 21 Jan 2011 13:39:02 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0LDd2VF039175 for ; Fri, 21 Jan 2011 13:39:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0LDd2Qk039172 for perforce@freebsd.org; Fri, 21 Jan 2011 13:39:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 21 Jan 2011 13:39:02 GMT Message-Id: <201101211339.p0LDd2Qk039172@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 188031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jan 2011 13:39:03 -0000 http://p4web.freebsd.org/@@188031?ac=10 Change 188031 by rwatson@rwatson_cinnamon on 2011/01/21 13:38:23 The parts of Capsicum being merged to 9-CURRENT are believed only to break your computer system in known ways. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#32 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#30 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#32 (text+ko) ==== @@ -2,10 +2,6 @@ * Copyright (c) 2008-2009 Robert N. M. Watson * All rights reserved. * - * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED - * ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND - * UNEXPECTED WAYS. - * * This software was developed at the University of Cambridge Computer * Laboratory with support from a grant from Google, Inc. * @@ -50,7 +46,7 @@ #include "opt_capabilities.h" #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#31 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#32 $"); #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#30 (text+ko) ==== @@ -1,10 +1,6 @@ /*- * Copyright (c) 2008-2009 Robert N. M. Watson * All rights reserved. - * - * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED - * ON IN PRODUCTION SYSTEMS. IT WILL BREAK YOUR SOFTWARE IN NEW AND - * UNEXPECTED WAYS. * * This software was developed at the University of Cambridge Computer * Laboratory with support from a grant from Google, Inc. @@ -30,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#29 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#30 $ */ /*