From e0f91aa9c2fbfc951e9ced7e1305455fc614d3f2 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 28 Jul 2023 05:33:15 +0000 Subject: [PATCH] upstream: don't need to start a command here; use ssh -N instead. Fixes failure on cygwin spotted by Darren OpenBSD-Regress-ID: ff678a8cc69160a3b862733d935ec4a383f93cfb --- regress/forward-control.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regress/forward-control.sh b/regress/forward-control.sh index 63bbdebe5cb..de957fcc89a 100644 --- a/regress/forward-control.sh +++ b/regress/forward-control.sh @@ -1,4 +1,4 @@ -# $OpenBSD: forward-control.sh,v 1.11 2022/04/21 01:36:46 dtucker Exp $ +# $OpenBSD: forward-control.sh,v 1.12 2023/07/28 05:33:15 djm Exp $ # Placed in the Public Domain. tid="sshd control of local and remote forwarding" @@ -36,7 +36,7 @@ check_lfwd() { -L$LFWD_PORT:127.0.0.1:$PORT \ -o ExitOnForwardFailure=yes \ -MS $CTL -o ControlPersist=yes \ - -f host true + -Nf host mux_cmd check >/dev/null || fatal "check_lfwd ssh fail: $_message" ${SSH} -F $OBJ/ssh_config -p $LFWD_PORT \ -oConnectionAttempts=10 host true >/dev/null 2>&1 @@ -63,7 +63,7 @@ check_rfwd() { -R127.0.0.1:$RFWD_PORT:127.0.0.1:$PORT \ -o ExitOnForwardFailure=yes \ -MS $CTL -o ControlPersist=yes \ - -f host true + -Nf host mux_cmd check >/dev/null _result=$? _sshpid=`controlmaster_pid`