]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Use our own netcat for dynamic-forward test.
authorDarren Tucker <dtucker@dtucker.net>
Sat, 7 Jan 2023 12:01:11 +0000 (23:01 +1100)
committerDarren Tucker <dtucker@dtucker.net>
Sat, 7 Jan 2023 12:01:11 +0000 (23:01 +1100)
That way we can be surer about its behaviour rather than trying to
second-guess the behaviour of various netcat implementations.

regress/dynamic-forward.sh

index b05fa28c38466c5b808f392cb956bb701e52ce46..1d98837854078d650cb2924cf34e3a4f524a0df1 100644 (file)
@@ -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() {