From 8f6f19b25c1719859d308c582feec689a232a008 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 5 Jul 2019 10:29:18 +0200
Subject: [PATCH] CONFIG: do not touch LD_PRELOAD contents at all (#1357)
---
etc/config.csh/setup | 6 +-----
etc/config.sh/setup | 6 ------
etc/config.sh/unset | 1 -
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/etc/config.csh/setup b/etc/config.csh/setup
index 8d2833c8c91..a63c3a93531 100644
--- a/etc/config.csh/setup
+++ b/etc/config.csh/setup
@@ -122,7 +122,7 @@ end
# Clean standard environment variables (PATH, MANPATH, LD_LIBRARY_PATH)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Prevent local variables from shadowing setenv variables
-unset PATH MANPATH LD_LIBRARY_PATH LD_PRELOAD
+unset PATH MANPATH LD_LIBRARY_PATH
if (! $?LD_LIBRARY_PATH ) setenv LD_LIBRARY_PATH
if (! $?MANPATH ) setenv MANPATH
@@ -167,10 +167,6 @@ if ( $?MANPATH ) then
setenv MANPATH "${MANPATH}:"
endif
-if ( $?LD_PRELOAD ) then
- _foamClean LD_PRELOAD
-endif
-
# Cleanup temporary information
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/etc/config.sh/setup b/etc/config.sh/setup
index ed692ec2595..03005db42a7 100644
--- a/etc/config.sh/setup
+++ b/etc/config.sh/setup
@@ -153,12 +153,6 @@ then
MANPATH="${MANPATH}:"
fi
-if [ -n "$LD_PRELOAD" ]
-then
- export LD_PRELOAD
- _foamClean LD_PRELOAD
-fi
-
# Cleanup temporary information
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index a44eaa96715..d2b7e20cd50 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -147,7 +147,6 @@ then
fi
[ -n "$LD_LIBRARY_PATH" ] || unset LD_LIBRARY_PATH
-[ -n "$LD_PRELOAD" ] || unset LD_PRELOAD
[ -n "$MANPATH" ] || unset MANPATH
#------------------------------------------------------------------------------
--
GitLab