Added check to the envvars file sourced by the AuthTokenValidate service
to keep us from invalidly setting LD_LIBRARY_PATH when the variable is not set.
This commit is contained in:
parent
dc46d381cc
commit
f2318eadd2
@ -42,10 +42,18 @@ TEST_IBM_JVM=$(/usr/$LIB/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm)
|
|||||||
if [ -z "${TEST_IBM_JVM}" ]; then
|
if [ -z "${TEST_IBM_JVM}" ]; then
|
||||||
# Assume Sun JVM
|
# Assume Sun JVM
|
||||||
JVM_VER=SUN
|
JVM_VER=SUN
|
||||||
|
if [ -z "${LD_LIBRARY_PATH}" ]; then
|
||||||
|
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre-1.5.0/lib/$SUNLIBDIR/server
|
||||||
|
else
|
||||||
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/lib/$SUNLIBDIR/server
|
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/lib/$SUNLIBDIR/server
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
JVM_VER=IBM
|
JVM_VER=IBM
|
||||||
|
if [ -z "${LD_LIBRARY_PATH}" ]; then
|
||||||
|
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre-1.5.0/bin:/usr/$LIB/jvm/jre-1.5.0/bin/classic
|
||||||
|
else
|
||||||
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/bin:/usr/$LIB/jvm/jre-1.5.0/bin/classic
|
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/bin:/usr/$LIB/jvm/jre-1.5.0/bin/classic
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
export JVM_VER
|
export JVM_VER
|
||||||
export LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 8 16:07:44 MST 2007 - jluciani@novell.com
|
||||||
|
|
||||||
|
- Resolved Bug 243162.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Feb 7 16:11:39 MST 2007 - jluciani@novell.com
|
Wed Feb 7 16:11:39 MST 2007 - jluciani@novell.com
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user