Date: Fri, 8 Jan 2010 15:28:22 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r201792 - projects/capabilities8/libexec/rtld-elf Message-ID: <201001081528.o08FSMVA011694@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001081528.o08FSMVA011694>