Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Oct 2009 16:42:36 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 169404 for review
Message-ID:  <200910111642.n9BGgadb046331@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help

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

Change 169404 by rwatson@rwatson_freebsd_capabilities on 2009/10/11 16:41:43

	In FreeBSD 9, need to use FBSD_1.2.
	
	Do offer a return code from ld_libcache_add(), as the caller will
	expect it when coming from outside of rtld.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Symbol.map#7 edit
.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld_libcache.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/Symbol.map#7 (text+ko) ====

@@ -2,7 +2,7 @@
  * $FreeBSD$
  */
 
-FBSD_1.1 {
+FBSD_1.2 {
     ld_libcache_add;
     ld_libcache_lookup;
     ld_insandbox;

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

@@ -74,7 +74,7 @@
 /*
  * 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 @@
 	liep->lie_name = xstrdup(name);
 	liep->lie_fd = fd;
 	TAILQ_INSERT_TAIL(&ld_libcache_list, liep, lie_list);
+	return (0);
 }
 
 /*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910111642.n9BGgadb046331>