diff options
| author | djm <djm> | 2014-07-22 01:31:47 +0000 |
|---|---|---|
| committer | djm <djm> | 2014-07-22 01:31:47 +0000 |
| commit | 0b87e206e047b0f46dcbcf07155d27054d6b9074 (patch) | |
| tree | cd1c73a7602613478239ad4dd79d3b17d06f93ca | |
| parent | 9f682357d5d7f28493bfa5b9ca066a2e2492b3ba (diff) | |
| download | openssh-0b87e206e047b0f46dcbcf07155d27054d6b9074.tar.gz | |
- (djm) [regress/multiplex.sh] change the test for still-open Unix
domain sockets to be robust against nc implementations that produce
error messages.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | regress/multiplex.sh | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -1,6 +1,9 @@ 20140722 - (djm) [regress/multiplex.sh] ssh mux master lost -N somehow; put it back + - (djm) [regress/multiplex.sh] change the test for still-open Unix + domain sockets to be robust against nc implementations that produce + error messages. 20140721 - OpenBSD CVS Sync diff --git a/regress/multiplex.sh b/regress/multiplex.sh index cc52f434..16bb5042 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh @@ -154,7 +154,7 @@ echo "" | $NC -U $OBJ/unix-1.fwd | grep "Protocol mismatch" >/dev/null 2>&1 \ || fail "connect to local forward path failed" ${SSH} -F $OBJ/ssh_config -S $CTL -Ocancel -L $OBJ/unix-1.fwd:localhost:$PORT otherhost \ || fail "cancel local 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 "local forward path still listening" rm -f $OBJ/unix-1.fwd @@ -166,7 +166,7 @@ echo "" | $NC -U $OBJ/unix-1.fwd | grep "Protocol mismatch" >/dev/null 2>&1 \ ${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) -test ${N} -eq 0 || fail "remote forward path still listening" +N=$(echo "xyzzy" | $NC -U $OBJ/unix-1.fwd 2>&1 | grep "xyzzy" | wc -l) rm -f $OBJ/unix-1.fwd verbose "test $tid: cmd exit" |