2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2b2948c15..69928b6ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20130801
  - (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need
    a better solution, but this will have to do for now.
+ - (djm) [regress/multiplex.sh] Instruct nc not to quit as soon as stdin
+   is closed; avoid regress failures when stdin is /dev/null
 
 20140730
  - OpenBSD CVS Sync
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 377281a0c..aaeba7f96 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -93,7 +93,7 @@ trace "forward over TCP/IP and check result"
 $NC -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} &
 netcat_pid=$!
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L127.0.0.1:$((${PORT} + 2)):127.0.0.1:$((${PORT} + 1)) otherhost >>$TEST_SSH_LOGFILE 2>&1
-$NC 127.0.0.1 $((${PORT} + 2)) > ${COPY}
+$NC -q5 127.0.0.1 $((${PORT} + 2)) > ${COPY} < /dev/null
 cmp ${DATA} ${COPY}             || fail "ssh: corrupted copy of ${DATA}"
 kill $netcat_pid 2>/dev/null
 rm -f ${COPY} $OBJ/unix-[123].fwd
@@ -103,7 +103,7 @@ $NC -Ul $OBJ/unix-1.fwd < ${DATA} &
 netcat_pid=$!
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L$OBJ/unix-2.fwd:$OBJ/unix-1.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1
 ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R$OBJ/unix-3.fwd:$OBJ/unix-2.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1
-$NC -U $OBJ/unix-3.fwd > ${COPY}
+$NC -q5 -U $OBJ/unix-3.fwd > ${COPY} </dev/null
 cmp ${DATA} ${COPY}             || fail "ssh: corrupted copy of ${DATA}"
 kill $netcat_pid 2>/dev/null
 rm -f ${COPY} $OBJ/unix-[123].fwd