diff options
author | Damien Miller <djm@mindrot.org> | 2014-07-22 09:39:19 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-07-22 09:39:19 +1000 |
commit | 5ea4fe00d55453aaa44007330bb4c3181bd9b796 (patch) | |
tree | bb4c2224cf9d006feec9bccd6a6f86f5a5bf6a56 | |
parent | 948a1774a79a85f9deba6d74db95f402dee32c69 (diff) | |
download | openssh-git-5ea4fe00d55453aaa44007330bb4c3181bd9b796.tar.gz |
- (djm) [regress/multiplex.sh] ssh mux master lost -N somehow;
put it back
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | regress/multiplex.sh | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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 5ef9049d..cc52f434 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=$! |