summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--regress/dynamic-forward.sh4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 256d8c288..35055a92d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
19 "grep -q" -> "grep >/dev/null" 19 "grep -q" -> "grep >/dev/null"
20 - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh 20 - [regress/agent.sh regress/proto-version.sh regress/ssh-com.sh
21 regress/test-exec.sh] Handle different was of echoing without newlines. 21 regress/test-exec.sh] Handle different was of echoing without newlines.
22 - [regress/dynamic-forward.sh] Some "which" programs output on stderr.
22 23
2320030903 2420030903
24 - (djm) OpenBSD CVS Sync 25 - (djm) OpenBSD CVS Sync
@@ -1009,4 +1010,4 @@
1009 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1010 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1010 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1011 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1011 1012
1012$Id: ChangeLog,v 1.2952 2003/09/04 05:16:56 dtucker Exp $ 1013$Id: ChangeLog,v 1.2953 2003/09/04 05:22:01 dtucker Exp $
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index d090814c5..afa1f103d 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -6,9 +6,9 @@ tid="dynamic forwarding"
6PORT=4242 6PORT=4242
7FWDPORT=4243 7FWDPORT=4243
8 8
9if [ -x `which nc` ] && nc -h 2>&1 | grep "x proxy address" >/dev/null; then 9if [ -x `which nc 2>&1` ] && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
10 proxycmd="nc -x 127.0.0.1:$FWDPORT -X" 10 proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
11elif [ -x `which connect` ]; then 11elif [ -x `which connect 2>&1` ]; then
12 proxycmd="connect -S 127.0.0.1:$FWDPORT -" 12 proxycmd="connect -S 127.0.0.1:$FWDPORT -"
13else 13else
14 echo "skipped (no suitable ProxyCommand found)" 14 echo "skipped (no suitable ProxyCommand found)"