diff options
| author | djm <djm> | 2014-07-24 22:11:30 +0000 |
|---|---|---|
| committer | djm <djm> | 2014-07-24 22:11:30 +0000 |
| commit | 4b53c7325716f4d3c3bfc44daa9d1af8c33ac865 (patch) | |
| tree | 79076f6c1c5e805407a669e5857094c344b20d58 | |
| parent | 1791f3fc55770e7c67a9c8c7c93fdc030b8fc7f5 (diff) | |
| download | openssh-4b53c7325716f4d3c3bfc44daa9d1af8c33ac865.tar.gz | |
- (djm) [regress/multiplex.sh] restore incorrectly deleted line;
pointed out by Christian Hesse
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | regress/multiplex.sh | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +20140725 + - (djm) [regress/multiplex.sh] restore incorrectly deleted line; + pointed out by Christian Hesse + 20140722 - (djm) [regress/multiplex.sh] ssh mux master lost -N somehow; put it back diff --git a/regress/multiplex.sh b/regress/multiplex.sh index fc32d13e..693211bf 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh @@ -165,8 +165,8 @@ echo "" | $NC -U $OBJ/unix-1.fwd | grep "Protocol mismatch" >/dev/null 2>&1 \ || fail "connect to remote forwarded path failed" ${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -R $OBJ/unix-1.fwd:localhost:$PORT otherhost \ || fail "cancel remote forward failed" -N=$(echo "" | $NC -U $OBJ/unix-1.fwd 2>&1 | wc -l) N=$(echo "xyzzy" | $NC -U $OBJ/unix-1.fwd 2>&1 | grep "xyzzy" | wc -l) +test ${N} -eq 0 || fail "remote forward path still listening" rm -f $OBJ/unix-1.fwd verbose "test $tid: cmd exit" |