From 68b184c75d771f6a878e09e1fafc66e293e8ba27 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 29 Feb 2004 20:37:06 +1100
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2004/02/28 12:16:57     
 [regress/dynamic-forward.sh]      Make dynamic-forward understand nc's new
 output.  ok markus@

---
 ChangeLog                  | 5 ++++-
 regress/dynamic-forward.sh | 4 ++--
 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 @@
      [regress/ssh-com-client.sh regress/ssh-com-keygen.sh
      regress/ssh-com-sftp.sh regress/ssh-com.sh]
      test against recent ssh.com releases
+   - dtucker@cvs.openbsd.org 2004/02/28 12:16:57
+     [regress/dynamic-forward.sh]
+     Make dynamic-forward understand nc's new output.  ok markus@
 
 20040226
  - (bal) KNF our sshlogin.c even if the code looks nothing like upstream
@@ -830,4 +833,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3267 2004/02/29 09:33:51 dtucker Exp $
+$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 @@
-#	$OpenBSD: dynamic-forward.sh,v 1.2 2003/07/03 08:21:46 markus Exp $
+#	$OpenBSD: dynamic-forward.sh,v 1.3 2004/02/28 12:16:57 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="dynamic forwarding"
@@ -7,7 +7,7 @@ PORT=4242
 FWDPORT=4243
 DATA=/bin/ls${EXEEXT}
 
-if have_prog nc && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
+if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
 	proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
 elif have_prog connect; then
 	proxycmd="connect -S 127.0.0.1:$FWDPORT -"