From owner-p4-projects@FreeBSD.ORG  Sun Oct 11 16:21:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B7531065693; Sun, 11 Oct 2009 16:21:13 +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 1FE37106568B
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:21:13 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D8DB8FC08
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:21:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n9BGLC2k044744
	for <perforce@freebsd.org>; Sun, 11 Oct 2009 16:21:12 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9BGLCPS044742
	for perforce@freebsd.org; Sun, 11 Oct 2009 16:21:12 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 11 Oct 2009 16:21:12 GMT
Message-Id: <200910111621.n9BGLCPS044742@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 169402 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2009 16:21:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=169402

Change 169402 by rwatson@rwatson_freebsd_capabilities on 2009/10/11 16:20:15

	Convert more references to caplibindex into libcache references.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.1#10 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.h#3 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#28 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.1#10 (text+ko) ====

@@ -66,7 +66,7 @@
 the different environments.
 .It
 Interprets the
-.Dv LD_CAPLIBINDEX
+.Dv LD_LIBCACHE
 environmental variable set by sandbox start routines, and implements
 .Fn ld_libcache_lookup ,
 allowing file descriptors for binaries and libraries passed across
@@ -106,7 +106,7 @@
 PRODUCTION SYSTEMS.  IT WILL BREAK YOUR SOFTWARE IN NEW AND UNEXPECTED WAYS.
 .Pp
 The format of
-.Dv LD_CAPLIBINDEX
+.Dv LD_LIBCACHE
 is not documented, and may change.
 .Sh AUTHORS
 .Nm

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.h#3 (text+ko) ====

@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#ifndef RTLD_CAPLIBINDEX_H
-#define	RTLD_CAPLIBINDEX_H
+#ifndef RTLD_LIBCACHE_H
+#define	RTLD_LIBCACHE_H
 
+int	ld_libcache_add(const char *libname, int fd);
 int	ld_libcache_lookup(const char *libname, int *fdp);
 void	ld_libcache_init(const char *libcache);
 
-#endif /* !RTLD_CAPLIBINDEX_H */
+#endif /* !RTLD_LIBCACHE_H */

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#28 (text+ko) ====

@@ -439,7 +439,7 @@
         unsetenv(LD_ "ELF_HINTS_PATH");
 #endif
 #ifdef IN_RTLD_CAP
-	unsetenv(LD_ "CAPLIBINDEX");
+	unsetenv(LD_ "LIBCACHE");
 #endif
     }
     ld_debug = getenv(LD_ "DEBUG");