summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-02-29 20:37:06 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-02-29 20:37:06 +1100
commit68b184c75d771f6a878e09e1fafc66e293e8ba27 (patch)
tree49ecae2315959629b71191065d27a2460f6c2db0
parent437a5f035b2e5c8fb4d15add5a90721f7e5918b4 (diff)
- dtucker@cvs.openbsd.org 2004/02/28 12:16:57
[regress/dynamic-forward.sh] Make dynamic-forward understand nc's new output. ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--regress/dynamic-forward.sh4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f3fb1e8f..b488dd7fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
25 [regress/ssh-com-client.sh regress/ssh-com-keygen.sh 25 [regress/ssh-com-client.sh regress/ssh-com-keygen.sh
26 regress/ssh-com-sftp.sh regress/ssh-com.sh] 26 regress/ssh-com-sftp.sh regress/ssh-com.sh]
27 test against recent ssh.com releases 27 test against recent ssh.com releases
28 - dtucker@cvs.openbsd.org 2004/02/28 12:16:57
29 [regress/dynamic-forward.sh]
30 Make dynamic-forward understand nc's new output. ok markus@
28 31
2920040226 3220040226
30 - (bal) KNF our sshlogin.c even if the code looks nothing like upstream 33 - (bal) KNF our sshlogin.c even if the code looks nothing like upstream
@@ -830,4 +833,4 @@
830 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 833 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
831 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 834 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
832 835
833$Id: ChangeLog,v 1.3267 2004/02/29 09:33:51 dtucker Exp $ 836$Id: ChangeLog,v 1.3268 2004/02/29 09:37:06 dtucker Exp $
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index 2b0b825d0..3a6e5c1ef 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: dynamic-forward.sh,v 1.2 2003/07/03 08:21:46 markus Exp $ 1# $OpenBSD: dynamic-forward.sh,v 1.3 2004/02/28 12:16:57 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="dynamic forwarding" 4tid="dynamic forwarding"
@@ -7,7 +7,7 @@ PORT=4242
7FWDPORT=4243 7FWDPORT=4243
8DATA=/bin/ls${EXEEXT} 8DATA=/bin/ls${EXEEXT}
9 9
10if have_prog nc && nc -h 2>&1 | grep "x proxy address" >/dev/null; then 10if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
11 proxycmd="nc -x 127.0.0.1:$FWDPORT -X" 11 proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
12elif have_prog connect; then 12elif have_prog connect; then
13 proxycmd="connect -S 127.0.0.1:$FWDPORT -" 13 proxycmd="connect -S 127.0.0.1:$FWDPORT -"