Date: Sun, 11 Oct 2009 16:21:12 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 169402 for review Message-ID: <200910111621.n9BGLCPS044742@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910111621.n9BGLCPS044742>