PERFORCE change 167112 for review

[Robert Watson]

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

Change 167112 by rwatson at rwatson_freebsd_capabilities on 2009/08/08 18:47:35

	Fix merge of rtld.c: we do need load_object() when in capability
	mode.

Affected files ...

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

Differences ...

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

@@ -123,8 +123,8 @@
 static int load_needed_objects(Obj_Entry *);
 #ifndef IN_RTLD_CAP
 static int load_preload_objects(void);
+#endif
 static Obj_Entry *load_object(const char *, const Obj_Entry *, int);
-#endif
 static Obj_Entry *obj_from_addr(const void *);
 static void objlist_call_fini(Objlist *, bool, int *);
 static void objlist_call_init(Objlist *, int *);