svn commit: r201792 - projects/capabilities8/libexec/rtld-elf

[Robert Watson]

Author: rwatson
Date: Fri Jan  8 15:28:22 2010
New Revision: 201792
URL: http://svn.freebsd.org/changeset/base/201792

Log:
  Fix merge bug.

Modified:
  projects/capabilities8/libexec/rtld-elf/rtld.c

Modified: projects/capabilities8/libexec/rtld-elf/rtld.c
==============================================================================
--- projects/capabilities8/libexec/rtld-elf/rtld.c	Fri Jan  8 15:18:57 2010	(r201791)
+++ projects/capabilities8/libexec/rtld-elf/rtld.c	Fri Jan  8 15:28:22 2010	(r201792)
@@ -433,7 +433,6 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
 		_rtld_error("environment corrupt; aborting");
 		die();
 	}
-#endif
 #ifdef IN_RTLD_CAP
 	unsetenv(LD_ "CAPLIBINDEX");
 #endif