diff options
author | Colin Watson <cjwatson@debian.org> | 2020-02-21 11:57:14 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-02-21 11:57:14 +0000 |
commit | f0de78bd4f29fa688c5df116f3f9cd43543a76d0 (patch) | |
tree | 856b0dee3f2764c13a32dad5ffe2424fab7fef41 /regress/multiplex.sh | |
parent | 4213eec74e74de6310c27a40c3e9759a08a73996 (diff) | |
parent | 8aa3455b16fddea4c0144a7c4a1edb10ec67dcc8 (diff) |
Import openssh_8.2p1.orig.tar.gz
Diffstat (limited to 'regress/multiplex.sh')
-rw-r--r-- | regress/multiplex.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index b5e604dba..817ddbfa8 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.30 2019/07/05 04:03:13 dtucker Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.32 2020/01/25 02:57:53 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | make_tmpdir | 4 | make_tmpdir |
@@ -6,8 +6,6 @@ CTL=${SSH_REGRESS_TMP}/ctl-sock | |||
6 | 6 | ||
7 | tid="connection multiplexing" | 7 | tid="connection multiplexing" |
8 | 8 | ||
9 | NC=$OBJ/netcat | ||
10 | |||
11 | trace "will use ProxyCommand $proxycmd" | 9 | trace "will use ProxyCommand $proxycmd" |
12 | if config_defined DISABLE_FD_PASSING ; then | 10 | if config_defined DISABLE_FD_PASSING ; then |
13 | echo "skipped (not supported on this platform)" | 11 | echo "skipped (not supported on this platform)" |
@@ -18,7 +16,7 @@ P=3301 # test port | |||
18 | 16 | ||
19 | wait_for_mux_master_ready() | 17 | wait_for_mux_master_ready() |
20 | { | 18 | { |
21 | for i in 1 2 3 4 5; do | 19 | for i in 1 2 3 4 5 6 7 8 9; do |
22 | ${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost \ | 20 | ${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost \ |
23 | >/dev/null 2>&1 && return 0 | 21 | >/dev/null 2>&1 && return 0 |
24 | sleep $i | 22 | sleep $i |