Date: Sat, 30 Jan 2010 18:15:31 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r203206 - in projects/capabilities8/libexec: rtld-elf rtld-elf-cap Message-ID: <201001301815.o0UIFV7F068909@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001301815.o0UIFV7F068909>