diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 22:44:25 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 22:44:25 +1100 |
commit | 53ced25d6185b4a02305e9d4bf648113155dde07 (patch) | |
tree | 0cf74a6241f04785790546eda1f13269e28af1bc | |
parent | 1629c07c0725fd5cc533c9664b8e8add27a81c69 (diff) | |
download | openssh-git-53ced25d6185b4a02305e9d4bf648113155dde07.tar.gz |
- (dtucker) [contrib/findssl.sh] Add "which" as a shell function since some
platforms don't have it. Patch from dleonard at vintela.com.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | contrib/findssl.sh | 21 |
2 files changed, 23 insertions, 2 deletions
@@ -41,6 +41,8 @@ authentication. This allows configurations such as permitting password authentication from the local net only while requiring pubkey from offsite. ok djm@, man page bits ok jmc@ + - (dtucker) [contrib/findssl.sh] Add "which" as a shell function since some + platforms don't have it. Patch from dleonard at vintela.com. 20070128 - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52) @@ -2736,4 +2738,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4617 2007/02/19 11:25:37 dtucker Exp $ +$Id: ChangeLog,v 1.4618 2007/02/19 11:44:25 dtucker Exp $ diff --git a/contrib/findssl.sh b/contrib/findssl.sh index 716abced..263fd264 100644 --- a/contrib/findssl.sh +++ b/contrib/findssl.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: findssl.sh,v 1.3 2004/12/13 07:08:33 dtucker Exp $ +# $Id: findssl.sh,v 1.4 2007/02/19 11:44:25 dtucker Exp $ # # findssl.sh # Search for all instances of OpenSSL headers and libraries @@ -89,6 +89,25 @@ LD_LIBRARY_PATH=${LD_LIBRARY_PATH:=$DEFAULT_LIBPATH} LIBRARY_PATH=${LIBRARY_PATH:=$DEFAULT_LIBPATH} export LIBPATH LD_LIBRARY_PATH LIBRARY_PATH +# not all platforms have a 'which' command +if which ls >/dev/null 2>/dev/null; then + : which is defined +else + which () { + saveIFS="$IFS" + IFS=: + for p in $PATH; do + if test -x "$p/$1" -a -f "$p/$1"; then + IFS="$saveIFS" + echo "$p/$1" + return 0 + fi + done + IFS="$saveIFS" + return 1 + } +fi + # # Search for OpenSSL headers and print versions # |