From 04f4824940ea3edd60835416ececbae16438968a Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 22 Jul 2014 11:31:47 +1000
Subject: [PATCH]  - (djm) [regress/multiplex.sh] change the test for
 still-open Unix     domain sockets to be robust against nc implementations
 that produce     error messages.

---
 ChangeLog            | 3 +++
 regress/multiplex.sh | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7905150a6..16c6bcc12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 cc52f4348..16bb5042f 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"