From: Darren Tucker <dtucker@dtucker.net>
Date: Sat, 7 Jan 2023 12:01:11 +0000 (+1100)
Subject: Use our own netcat for dynamic-forward test.
X-Git-Tag: V_9_2_P1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cd2aac312af9172f1b5cb06c2e1cd090abb83cf;p=thirdparty%2Fopenssh-portable.git

Use our own netcat for dynamic-forward test.

That way we can be surer about its behaviour rather than trying to
second-guess the behaviour of various netcat implementations.
---

diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index b05fa28c3..1d9883785 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -7,14 +7,7 @@ FWDPORT=`expr $PORT + 1`
 
 cp $OBJ/ssh_config $OBJ/ssh_config.orig
 
-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 -"
-else
-	echo "skipped (no suitable ProxyCommand found)"
-	exit 0
-fi
+proxycmd="$OBJ/netcat -x 127.0.0.1:$FWDPORT -X"
 trace "will use ProxyCommand $proxycmd"
 
 start_ssh() {