From c863895e0ab7f9430402736e953e62dae46be458 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 7 Oct 2009 10:46:29 +1100 Subject: [PATCH] - djm@cvs.openbsd.org 2009/08/20 18:43:07 [ssh-com-sftp.sh] fix one sftp -D ... => sftp -P ... conversion that I missed; from Carlos Silva for Google Summer of Code --- ChangeLog | 4 ++++ regress/ssh-com-sftp.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4df4b4951..bcaae4fef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,10 @@ used by our regression scripts. part of larger patch from carlosvsilvapt@gmail.com for his Google Summer of Code work; ok deraadt markus + - djm@cvs.openbsd.org 2009/08/20 18:43:07 + [ssh-com-sftp.sh] + fix one sftp -D ... => sftp -P ... conversion that I missed; from Carlos + Silva for Google Summer of Code 20091002 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. diff --git a/regress/ssh-com-sftp.sh b/regress/ssh-com-sftp.sh index 936b4cca7..be6f4e0dc 100644 --- a/regress/ssh-com-sftp.sh +++ b/regress/ssh-com-sftp.sh @@ -1,4 +1,4 @@ -# $OpenBSD: ssh-com-sftp.sh,v 1.5 2004/02/24 17:06:52 markus Exp $ +# $OpenBSD: ssh-com-sftp.sh,v 1.6 2009/08/20 18:43:07 djm Exp $ # Placed in the Public Domain. tid="basic sftp put/get with ssh.com server" @@ -51,7 +51,7 @@ for v in ${VERSIONS}; do for R in ${REQUESTS}; do verbose "test $tid: buffer_size $B num_requests $R" rm -f ${COPY}.1 ${COPY}.2 - ${SFTP} -P ${server} -B $B -R $R -b $SFTPCMDFILE \ + ${SFTP} -D ${server} -B $B -R $R -b $SFTPCMDFILE \ > /dev/null 2>&1 r=$? if [ $r -ne 0 ]; then