Attachment 2158 Details for Bug 2013 – proposed patch

[patch] proposed patch

ssh-regress-avoid-truncate.patch (text/plain), 1.85 KB, created by Roumen Petrov on 2012-05-26 06:40:52 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Roumen Petrov

Created: 2012-05-26 06:40:52 AEST

Size: 1.85 KB

patch

obsolete

>diff -ruN openssh-6.0p1/regress/forwarding.sh openssh-6.0p1+x509-7.2/regress/forwarding.sh
>--- openssh-6.0p1/regress/forwarding.sh	2010-02-24 08:25:59.000000000 +0200
>+++ openssh-6.0p1+x509-7.2/regress/forwarding.sh	2012-05-25 09:06:00.000000000 +0300
>@@ -75,7 +75,7 @@
> 	else
> 		# this one should fail
> 		${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
>-		     2>${TEST_SSH_LOGFILE} && \
>+		     2>>$TEST_SSH_LOGFILE && \
> 			fail "local forwarding not cleared"
> 	fi
> 	sleep 10
>@@ -88,7 +88,7 @@
> 	else
> 		# this one should fail
> 		${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
>-		     2>${TEST_SSH_LOGFILE} && \
>+		     2>>$TEST_SSH_LOGFILE && \
> 			fail "remote forwarding not cleared"
> 	fi
> 	sleep 10
>diff -ruN openssh-6.0p1/regress/multiplex.sh openssh-6.0p1+x509-7.2/regress/multiplex.sh
>--- openssh-6.0p1/regress/multiplex.sh	2011-01-17 07:17:12.000000000 +0200
>+++ openssh-6.0p1+x509-7.2/regress/multiplex.sh	2012-05-25 09:06:00.000000000 +0300
>@@ -12,7 +12,6 @@
> 
> DATA=/bin/ls${EXEEXT}
> COPY=$OBJ/ls.copy
>-LOG=$TEST_SSH_LOGFILE
> 
> start_sshd
> 
>@@ -48,13 +47,13 @@
> 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 >$LOG 2>&1
>+	${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} >$LOG 2>&1
>+${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}"
>

Actions: View | Diff

Attachments on bug 2013: 2158