summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2012-03-08 16:10:51 +0000
committerJim Jagielski <jim@apache.org>2012-03-08 16:10:51 +0000
commita66939f8049cfdfe68447cba43b1912ba1589b2a (patch)
tree2c138ee8213bf4339c61590ef645c628f14f1e59 /support
parentd81fdd8ce764dcc94eb81e0fb8f7153a0821c5b1 (diff)
downloadhttpd-a66939f8049cfdfe68447cba43b1912ba1589b2a.tar.gz
Merge r1296428 from trunk:
Fix insecure handling of LD_LIBRARY_PATH that could lead to the current working directory to be searched for DSOs CVE-2012-0883 Submitted by: sf Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1298453 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support')
-rw-r--r--support/envvars-std.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/support/envvars-std.in b/support/envvars-std.in
index cf50c5c75e..9493bc749c 100644
--- a/support/envvars-std.in
+++ b/support/envvars-std.in
@@ -18,7 +18,11 @@
#
# This file is generated from envvars-std.in
#
-@SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
+if test "x$@SHLIBPATH_VAR@" != "x" ; then
+ @SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@"
+else
+ @SHLIBPATH_VAR@="@exp_libdir@"
+fi
export @SHLIBPATH_VAR@
#
@OS_SPECIFIC_VARS@