Attachment #2158 for bug #2013

View | Details | Raw Unified | Return to bug 2013
Collapse All | Expand All

Lines 75-81 Link Here

(-)openssh-6.0p1/regress/forwarding.sh (-2 / +2 lines)
75	else	75	else
76	# this one should fail	76	# this one should fail
77	${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \	77	${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
78	2>${TEST_SSH_LOGFILE} && \	78	2>>$TEST_SSH_LOGFILE && \
79	fail "local forwarding not cleared"	79	fail "local forwarding not cleared"
80	fi	80	fi
81	sleep 10	81	sleep 10
Lines 88-94 Link Here
88	else	88	else
89	# this one should fail	89	# this one should fail
90	${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \	90	${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
91	2>${TEST_SSH_LOGFILE} && \	91	2>>$TEST_SSH_LOGFILE && \
92	fail "remote forwarding not cleared"	92	fail "remote forwarding not cleared"
93	fi	93	fi
94	sleep 10	94	sleep 10





DATA=/bin/ls${EXEEXT}
COPY=$OBJ/ls.copy
LOG=$TEST_SSH_LOGFILE

start_sshd


rm -f ${COPY}
trace "sftp transfer over multiplexed connection and check result"
echo "get ${DATA} ${COPY}" | \
	${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >>$TEST_SSH_LOGFILE 2>&1
test -f ${COPY}			|| fail "sftp: failed copy ${DATA}" 
cmp ${DATA} ${COPY}		|| fail "sftp: corrupted copy of ${DATA}"

rm -f ${COPY}
trace "scp transfer over multiplexed connection and check result"
${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >>$TEST_SSH_LOGFILE 2>&1
test -f ${COPY}			|| fail "scp: failed copy ${DATA}" 
cmp ${DATA} ${COPY}		|| fail "scp: corrupted copy of ${DATA}"


Return to bug 2013

Lines 12-18 Link Here

(-)openssh-6.0p1/regress/multiplex.sh (-3 / +2 lines)
12		12
13	DATA=/bin/ls${EXEEXT}	13	DATA=/bin/ls${EXEEXT}
14	COPY=$OBJ/ls.copy	14	COPY=$OBJ/ls.copy
15	LOG=$TEST_SSH_LOGFILE
16		15
17	start_sshd	16	start_sshd
18		17
Lines 48-60 Link Here
48	rm -f ${COPY}	47	rm -f ${COPY}
49	trace "sftp transfer over multiplexed connection and check result"	48	trace "sftp transfer over multiplexed connection and check result"
50	echo "get ${DATA} ${COPY}" \| \	49	echo "get ${DATA} ${COPY}" \| \
51	${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >$LOG 2>&1	50	${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >>$TEST_SSH_LOGFILE 2>&1
52	test -f ${COPY} \|\| fail "sftp: failed copy ${DATA}"	51	test -f ${COPY} \|\| fail "sftp: failed copy ${DATA}"
53	cmp ${DATA} ${COPY} \|\| fail "sftp: corrupted copy of ${DATA}"	52	cmp ${DATA} ${COPY} \|\| fail "sftp: corrupted copy of ${DATA}"
54		53
55	rm -f ${COPY}	54	rm -f ${COPY}
56	trace "scp transfer over multiplexed connection and check result"	55	trace "scp transfer over multiplexed connection and check result"
57	${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >$LOG 2>&1	56	${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >>$TEST_SSH_LOGFILE 2>&1
58	test -f ${COPY} \|\| fail "scp: failed copy ${DATA}"	57	test -f ${COPY} \|\| fail "scp: failed copy ${DATA}"
59	cmp ${DATA} ${COPY} \|\| fail "scp: corrupted copy of ${DATA}"	58	cmp ${DATA} ${COPY} \|\| fail "scp: corrupted copy of ${DATA}"
60		59