3571e53040
patches for easier mirroring, to eliminate a special copy, to make www.freebsd.org/security a full copy of security.freebsd.org and be eventually be the same. For now files are just sitting there. The symlinks are missing. Discussed on: www (repository location) Discussed with: simon (so)
23 lines
900 B
Diff
23 lines
900 B
Diff
Index: libexec/rtld-elf/rtld.c
|
|
===================================================================
|
|
--- libexec/rtld-elf/rtld.c (revision 199978)
|
|
+++ libexec/rtld-elf/rtld.c (revision 199979)
|
|
@@ -366,12 +366,12 @@
|
|
* future processes to honor the potentially un-safe variables.
|
|
*/
|
|
if (!trust) {
|
|
- unsetenv(LD_ "PRELOAD");
|
|
- unsetenv(LD_ "LIBMAP");
|
|
- unsetenv(LD_ "LIBRARY_PATH");
|
|
- unsetenv(LD_ "LIBMAP_DISABLE");
|
|
- unsetenv(LD_ "DEBUG");
|
|
- unsetenv(LD_ "ELF_HINTS_PATH");
|
|
+ if (unsetenv(LD_ "PRELOAD") || unsetenv(LD_ "LIBMAP") ||
|
|
+ unsetenv(LD_ "LIBRARY_PATH") || unsetenv(LD_ "LIBMAP_DISABLE") ||
|
|
+ unsetenv(LD_ "DEBUG") || unsetenv(LD_ "ELF_HINTS_PATH")) {
|
|
+ _rtld_error("environment corrupt; aborting");
|
|
+ die();
|
|
+ }
|
|
}
|
|
ld_debug = getenv(LD_ "DEBUG");
|
|
libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL;
|