From owner-svn-src-projects@FreeBSD.ORG Sat Jan 30 18:15:31 2010 Return-Path: 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 A61F0106566B; Sat, 30 Jan 2010 18:15:31 +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 7C6798FC14; Sat, 30 Jan 2010 18:15:31 +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 o0UIFVIc068913; Sat, 30 Jan 2010 18:15:31 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UIFV7F068909; Sat, 30 Jan 2010 18:15:31 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201001301815.o0UIFV7F068909@svn.freebsd.org> From: Robert Watson Date: Sat, 30 Jan 2010 18:15:31 +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: r203206 - in projects/capabilities8/libexec: rtld-elf rtld-elf-cap X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 18:15:31 -0000 Author: rwatson Date: Sat Jan 30 18:15:31 2010 New Revision: 203206 URL: http://svn.freebsd.org/changeset/base/203206 Log: Merge c169402 from the p4 TrustedBSD Capabilities branch to capabilities8: Convert more references to caplibindex into libcache references. Sponsored by: Google, Inc. Modified: projects/capabilities8/libexec/rtld-elf-cap/rtld-elf-cap.1 projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.h projects/capabilities8/libexec/rtld-elf/rtld.c Modified: projects/capabilities8/libexec/rtld-elf-cap/rtld-elf-cap.1 ============================================================================== --- projects/capabilities8/libexec/rtld-elf-cap/rtld-elf-cap.1 Sat Jan 30 18:14:01 2010 (r203205) +++ projects/capabilities8/libexec/rtld-elf-cap/rtld-elf-cap.1 Sat Jan 30 18:15:31 2010 (r203206) @@ -66,7 +66,7 @@ This makes it easy a single binary to se 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 @@ WARNING: THIS IS EXPERIMENTAL SECURITY S 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 Modified: projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.h ============================================================================== --- projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.h Sat Jan 30 18:14:01 2010 (r203205) +++ projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.h Sat Jan 30 18:15:31 2010 (r203206) @@ -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 */ Modified: projects/capabilities8/libexec/rtld-elf/rtld.c ============================================================================== --- projects/capabilities8/libexec/rtld-elf/rtld.c Sat Jan 30 18:14:01 2010 (r203205) +++ projects/capabilities8/libexec/rtld-elf/rtld.c Sat Jan 30 18:15:31 2010 (r203206) @@ -435,7 +435,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ die(); } #ifdef IN_RTLD_CAP - unsetenv(LD_ "CAPLIBINDEX"); + unsetenv(LD_ "LIBCACHE"); #endif } ld_debug = getenv(LD_ "DEBUG");