RT4586: Remove RSA_memory_lock; unused, not needed

[openssl.git] / util / shlib_wrap.sh

diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh
index 9416d593d2b8d48fcb4579f6718826b8813501bd..ce463f17e8229183cde9719118dcb190e8d173ae 100755 (executable)
--- a/util/shlib_wrap.sh
+++ b/util/shlib_wrap.sh
@@ -27,6 +27,15 @@ SunOS|IRIX*)
                LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64
                preload_var=LD_PRELOAD_64
                ;;
+       *ELF\ 32*SPARC*|*ELF\ 32*80386*)
+               # We only need to change LD_PRELOAD_32 and LD_LIBRARY_PATH_32
+               # on a multi-arch system.  Otherwise, trust the fallbacks.
+               if [ -f /lib/64/ld.so.1 ]; then
+                   [ -n "$LD_LIBRARY_PATH_32" ] && rld_var=LD_LIBRARY_PATH_32
+                   LD_PRELOAD_32="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_32
+                   preload_var=LD_PRELOAD_32
+               fi
+               ;;
        # Why are newly built .so's preloaded anyway? Because run-time
        # .so lookup path embedded into application takes precedence
        # over LD_LIBRARY_PATH and as result application ends up linking
@@ -88,6 +97,10 @@ if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
        export LD_PRELOAD _RLD_LIST DYLD_INSERT_LIBRARIES
 fi
 
-cmd="$1${EXE_EXT}"
+cmd="$1"; [ -x "$cmd" ] || cmd="$cmd${EXE_EXT}"
 shift
-exec "$cmd" "$@"
+if [ $# -eq 0 ]; then
+       exec "$cmd"     # old sh, such as Tru64 4.x, fails to expand empty "$@"
+else
+       exec "$cmd" "$@"
+fi