diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | contrib/findssl.sh | 21 |
2 files changed, 23 insertions, 2 deletions
@@ -41,6 +41,8 @@ | |||
41 | authentication. This allows configurations such as permitting password | 41 | authentication. This allows configurations such as permitting password |
42 | authentication from the local net only while requiring pubkey from | 42 | authentication from the local net only while requiring pubkey from |
43 | offsite. ok djm@, man page bits ok jmc@ | 43 | offsite. ok djm@, man page bits ok jmc@ |
44 | - (dtucker) [contrib/findssl.sh] Add "which" as a shell function since some | ||
45 | platforms don't have it. Patch from dleonard at vintela.com. | ||
44 | 46 | ||
45 | 20070128 | 47 | 20070128 |
46 | - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52) | 48 | - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52) |
@@ -2736,4 +2738,4 @@ | |||
2736 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2738 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2737 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2739 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2738 | 2740 | ||
2739 | $Id: ChangeLog,v 1.4617 2007/02/19 11:25:37 dtucker Exp $ | 2741 | $Id: ChangeLog,v 1.4618 2007/02/19 11:44:25 dtucker Exp $ |
diff --git a/contrib/findssl.sh b/contrib/findssl.sh index 716abced5..263fd2644 100644 --- a/contrib/findssl.sh +++ b/contrib/findssl.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | # $Id: findssl.sh,v 1.3 2004/12/13 07:08:33 dtucker Exp $ | 3 | # $Id: findssl.sh,v 1.4 2007/02/19 11:44:25 dtucker Exp $ |
4 | # | 4 | # |
5 | # findssl.sh | 5 | # findssl.sh |
6 | # Search for all instances of OpenSSL headers and libraries | 6 | # Search for all instances of OpenSSL headers and libraries |
@@ -89,6 +89,25 @@ LD_LIBRARY_PATH=${LD_LIBRARY_PATH:=$DEFAULT_LIBPATH} | |||
89 | LIBRARY_PATH=${LIBRARY_PATH:=$DEFAULT_LIBPATH} | 89 | LIBRARY_PATH=${LIBRARY_PATH:=$DEFAULT_LIBPATH} |
90 | export LIBPATH LD_LIBRARY_PATH LIBRARY_PATH | 90 | export LIBPATH LD_LIBRARY_PATH LIBRARY_PATH |
91 | 91 | ||
92 | # not all platforms have a 'which' command | ||
93 | if which ls >/dev/null 2>/dev/null; then | ||
94 | : which is defined | ||
95 | else | ||
96 | which () { | ||
97 | saveIFS="$IFS" | ||
98 | IFS=: | ||
99 | for p in $PATH; do | ||
100 | if test -x "$p/$1" -a -f "$p/$1"; then | ||
101 | IFS="$saveIFS" | ||
102 | echo "$p/$1" | ||
103 | return 0 | ||
104 | fi | ||
105 | done | ||
106 | IFS="$saveIFS" | ||
107 | return 1 | ||
108 | } | ||
109 | fi | ||
110 | |||
92 | # | 111 | # |
93 | # Search for OpenSSL headers and print versions | 112 | # Search for OpenSSL headers and print versions |
94 | # | 113 | # |