summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/ssh-com-sftp.sh4
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 @@
108 used by our regression scripts. 108 used by our regression scripts.
109 part of larger patch from carlosvsilvapt@gmail.com for his Google Summer 109 part of larger patch from carlosvsilvapt@gmail.com for his Google Summer
110 of Code work; ok deraadt markus 110 of Code work; ok deraadt markus
111 - djm@cvs.openbsd.org 2009/08/20 18:43:07
112 [ssh-com-sftp.sh]
113 fix one sftp -D ... => sftp -P ... conversion that I missed; from Carlos
114 Silva for Google Summer of Code
111 115
11220091002 11620091002
113 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. 117 - (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 @@
1# $OpenBSD: ssh-com-sftp.sh,v 1.5 2004/02/24 17:06:52 markus Exp $ 1# $OpenBSD: ssh-com-sftp.sh,v 1.6 2009/08/20 18:43:07 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="basic sftp put/get with ssh.com server" 4tid="basic sftp put/get with ssh.com server"
@@ -51,7 +51,7 @@ for v in ${VERSIONS}; do
51 for R in ${REQUESTS}; do 51 for R in ${REQUESTS}; do
52 verbose "test $tid: buffer_size $B num_requests $R" 52 verbose "test $tid: buffer_size $B num_requests $R"
53 rm -f ${COPY}.1 ${COPY}.2 53 rm -f ${COPY}.1 ${COPY}.2
54 ${SFTP} -P ${server} -B $B -R $R -b $SFTPCMDFILE \ 54 ${SFTP} -D ${server} -B $B -R $R -b $SFTPCMDFILE \
55 > /dev/null 2>&1 55 > /dev/null 2>&1
56 r=$? 56 r=$?
57 if [ $r -ne 0 ]; then 57 if [ $r -ne 0 ]; then