diff --git a/ChangeLog b/ChangeLog index 987647b96..7905150a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20140722 + - (djm) [regress/multiplex.sh] ssh mux master lost -N somehow; + put it back + 20140721 - OpenBSD CVS Sync - millert@cvs.openbsd.org 2014/07/15 15:54:15 diff --git a/regress/multiplex.sh b/regress/multiplex.sh index 5ef9049d1..cc52f4348 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh @@ -39,7 +39,7 @@ start_sshd start_mux_master() { trace "start master, fork to background" - ${SSH} -n2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost \ + ${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost \ -E $TEST_REGRESS_LOGFILE 2>&1 & # NB. $SSH_PID will be killed by test-exec.sh:cleanup on fatal errors. SSH_PID=$!