diff options
| author | Damien Miller <djm@mindrot.org> | 2014-08-01 13:31:52 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-08-01 13:31:52 +1000 |
| commit | f8988fbef0c9801d19fa2f8f4f041690412bec37 (patch) | |
| tree | 71f4941b4e8b51379e2c3360001651f747f38a62 /regress/multiplex.sh | |
| parent | 5b3879fd4b7a4e3d43bab8f40addda39bc1169d0 (diff) | |
- (djm) [regress/multiplex.sh] Use -d (detach stdin) flag to disassociate
nc from stdin, it's more portable
Diffstat (limited to 'regress/multiplex.sh')
| -rw-r--r-- | regress/multiplex.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index aaeba7f96..8ee140be6 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
| @@ -93,7 +93,7 @@ trace "forward over TCP/IP and check result" | |||
| 93 | $NC -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} & | 93 | $NC -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} & |
| 94 | netcat_pid=$! | 94 | netcat_pid=$! |
| 95 | ${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 | 95 | ${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 |
| 96 | $NC -q5 127.0.0.1 $((${PORT} + 2)) > ${COPY} < /dev/null | 96 | $NC -d 127.0.0.1 $((${PORT} + 2)) > ${COPY} < /dev/null |
| 97 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" | 97 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" |
| 98 | kill $netcat_pid 2>/dev/null | 98 | kill $netcat_pid 2>/dev/null |
| 99 | rm -f ${COPY} $OBJ/unix-[123].fwd | 99 | rm -f ${COPY} $OBJ/unix-[123].fwd |
| @@ -103,7 +103,7 @@ $NC -Ul $OBJ/unix-1.fwd < ${DATA} & | |||
| 103 | netcat_pid=$! | 103 | netcat_pid=$! |
| 104 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L$OBJ/unix-2.fwd:$OBJ/unix-1.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 | 104 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L$OBJ/unix-2.fwd:$OBJ/unix-1.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 |
| 105 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R$OBJ/unix-3.fwd:$OBJ/unix-2.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 | 105 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R$OBJ/unix-3.fwd:$OBJ/unix-2.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 |
| 106 | $NC -q5 -U $OBJ/unix-3.fwd > ${COPY} </dev/null | 106 | $NC -d -U $OBJ/unix-3.fwd > ${COPY} </dev/null |
| 107 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" | 107 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" |
| 108 | kill $netcat_pid 2>/dev/null | 108 | kill $netcat_pid 2>/dev/null |
| 109 | rm -f ${COPY} $OBJ/unix-[123].fwd | 109 | rm -f ${COPY} $OBJ/unix-[123].fwd |