Date: Fri, 21 Jan 2011 13:39:02 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 188031 for review Message-ID: <201101211339.p0LDd2Qk039172@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/cdefs.h> -__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 <sys/param.h> #include <sys/capability.h> ==== //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 $ */ /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101211339.p0LDd2Qk039172>