tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [regress/multiplex.sh] Instruct nc not to quit as soon as stdin 

is closed; avoid regress failures when stdin is /dev/null
This commit is contained in:
Damien Miller 2014-08-01 12:28:31 +10:00
parent a9c46746d2
commit 5b3879fd4b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
20130801 20130801
- (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need - (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need
a better solution, but this will have to do for now. 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 20140730
- OpenBSD CVS Sync - OpenBSD CVS Sync

4
regress/multiplex.sh
View File

@ -93,7 +93,7 @@ trace "forward over TCP/IP and check result"
$NC -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} & $NC -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} &
netcat_pid=$! 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 ${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}" cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}"
kill $netcat_pid 2>/dev/null kill $netcat_pid 2>/dev/null
rm -f ${COPY} $OBJ/unix-[123].fwd rm -f ${COPY} $OBJ/unix-[123].fwd
@ -103,7 +103,7 @@ $NC -Ul $OBJ/unix-1.fwd < ${DATA} &
netcat_pid=$! 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 -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 ${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}" cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}"
kill $netcat_pid 2>/dev/null kill $netcat_pid 2>/dev/null
rm -f ${COPY} $OBJ/unix-[123].fwd rm -f ${COPY} $OBJ/unix-[123].fwd