Date: Sat, 30 Jan 2010 18:16:57 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r203207 - projects/capabilities8/libexec/rtld-elf-cap Message-ID: <201001301816.o0UIGvtW069253@svn.freebsd.org>
index | next in thread | raw e-mail
Author: rwatson Date: Sat Jan 30 18:16:57 2010 New Revision: 203207 URL: http://svn.freebsd.org/changeset/base/203207 Log: Merge (partial) c169404 from the p4 TrustedBSD Capabilities branch to capabilities8: Do offer a return code from ld_libcache_add(), as the caller will expect it when coming from outside of rtld. Excluded: In FreeBSD 9, need to use FBSD_1.2. Sponsored by: Google, Inc. Modified: projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.c Modified: projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.c ============================================================================== --- projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.c Sat Jan 30 18:15:31 2010 (r203206) +++ projects/capabilities8/libexec/rtld-elf-cap/rtld_libcache.c Sat Jan 30 18:16:57 2010 (r203207) @@ -74,7 +74,7 @@ static TAILQ_HEAD(, libcache_entry) ld_l /* * Add a library to the library cache. */ -void +int ld_libcache_add(const char *name, int fd) { struct libcache_entry *liep; @@ -83,6 +83,7 @@ ld_libcache_add(const char *name, int fd liep->lie_name = xstrdup(name); liep->lie_fd = fd; TAILQ_INSERT_TAIL(&ld_libcache_list, liep, lie_list); + return (0); } /*help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001301816.o0UIGvtW069253>