summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2023-01-07 23:01:11 +1100
committerDarren Tucker <dtucker@dtucker.net>2023-01-07 23:01:11 +1100
commit1cd2aac312af9172f1b5cb06c2e1cd090abb83cf (patch)
treea5337eda099143ad2494b361fea812618c1663dc
parent26cab41c05d7b0859d2a1ea5b6ed253d91848a80 (diff)
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.
-rw-r--r--regress/dynamic-forward.sh9
1 files changed, 1 insertions, 8 deletions
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index b05fa28c..1d988378 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() {