From owner-svn-src-all@FreeBSD.ORG  Mon Nov 28 14:39:57 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 00744106564A;
	Mon, 28 Nov 2011 14:39:57 +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 E39988FC14;
	Mon, 28 Nov 2011 14:39:56 +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 pASEduuP095406;
	Mon, 28 Nov 2011 14:39:56 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pASEduEI095403;
	Mon, 28 Nov 2011 14:39:56 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201111281439.pASEduEI095403@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 28 Nov 2011 14:39:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228070 - stable/9/lib/libc/sys
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: Mon, 28 Nov 2011 14:39:57 -0000

Author: rwatson
Date: Mon Nov 28 14:39:56 2011
New Revision: 228070
URL: http://svn.freebsd.org/changeset/base/228070

Log:
  Merge r228040 from head to stable/9:
  
    Cross-reference capsicum.4 from cap_enter.2 and cap_new.2.
  
    Sponsored by:	Google, Inc.
  
  Approved by:	re (kib)

Modified:
  stable/9/lib/libc/sys/cap_enter.2
  stable/9/lib/libc/sys/cap_new.2
Directory Properties:
  stable/9/lib/libc/   (props changed)
  stable/9/lib/libc/stdtime/   (props changed)

Modified: stable/9/lib/libc/sys/cap_enter.2
==============================================================================
--- stable/9/lib/libc/sys/cap_enter.2	Mon Nov 28 14:36:06 2011	(r228069)
+++ stable/9/lib/libc/sys/cap_enter.2	Mon Nov 28 14:39:56 2011	(r228070)
@@ -89,7 +89,8 @@ acquired rights as possible.
 .Rv -std cap_enter cap_getmode
 .Sh SEE ALSO
 .Xr cap_new 2 ,
-.Xr fexecve 2
+.Xr fexecve 2 ,
+.Xr capsicum 4
 .Sh HISTORY
 Support for capabilities and capabilities mode was developed as part of the
 .Tn TrustedBSD

Modified: stable/9/lib/libc/sys/cap_new.2
==============================================================================
--- stable/9/lib/libc/sys/cap_new.2	Mon Nov 28 14:36:06 2011	(r228069)
+++ stable/9/lib/libc/sys/cap_new.2	Mon Nov 28 14:39:56 2011	(r228070)
@@ -456,6 +456,7 @@ argument is not a capability.
 .Xr sem_post 3 ,
 .Xr sem_trywait 3 ,
 .Xr sem_wait 3 ,
+.Xr capsicum 4 ,
 .Xr snp 4
 .Sh HISTORY
 Support for capabilities and capabilities mode was developed as part of the