Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Jun 2009 13:33:50 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 163710 for review
Message-ID:  <200906071333.n57DXos9010770@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=163710

Change 163710 by rwatson@rwatson_freebsd_capabilities on 2009/06/07 13:32:54

	Make output from ld-elf-cap.so more meaningful by printing its name
	properly in rtld error messages.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#13 edit

Differences ...

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

@@ -60,10 +60,18 @@
 #include "rtld_tls.h"
 
 #ifndef COMPAT_32BIT
+#ifdef IN_RTLD_CAP
+#define	PATH_RTLD	"/libexec/ld-elf-cap.so.1"
+#else
 #define PATH_RTLD	"/libexec/ld-elf.so.1"
+#endif
 #else
+#ifdef IN_RTLD_CAP
+#define	PATH_RTLD	"/libexex/ld-elf32-cap.so.1"
+#else
 #define PATH_RTLD	"/libexec/ld-elf32.so.1"
 #endif
+#endif
 
 /* Types. */
 typedef void (*func_ptr_type)();



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