- djm@cvs.openbsd.org 2009/08/13 01:11:55

     [sftp-batch.sh sftp-badcmds.sh sftp.sh sftp-cmds.sh sftp-glob.sh]
     date: 2009/08/13 01:11:19;  author: djm;  state: Exp;  lines: +10 -7
     Swizzle options: "-P sftp_server_path" moves to "-D sftp_server_path",
     add "-P port" to match scp(1). Fortunately, the -P option is only really
     used by our regression scripts.
     part of larger patch from carlosvsilvapt@gmail.com for his Google Summer
     of Code work; ok deraadt markus

1 files changed, 3 insertions, 3 deletions

diff --git a/regress/sftp.sh b/regress/sftp.sh
index 0e22f8f6b..f84fa6f4e 100644
--- a/regress/sftp.sh
+++ b/regress/sftp.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: sftp.sh,v 1.2 2002/03/27 22:39:52 markus Exp $
+#       $OpenBSD: sftp.sh,v 1.3 2009/08/13 01:11:55 djm Exp $
 #       Placed in the Public Domain.
 
 tid="basic sftp put/get"
@@ -19,8 +19,8 @@ REQUESTS="1 2 10"
 for B in ${BUFFERSIZE}; do
         for R in ${REQUESTS}; do
                 verbose "test $tid: buffer_size $B num_requests $R"
-                rm -f ${COPY}.1 ${COPY}.2                
-                ${SFTP} -P ${SFTPSERVER} -B $B -R $R -b $SFTPCMDFILE \
+                rm -f ${COPY}.1 ${COPY}.2
+                ${SFTP} -D ${SFTPSERVER} -B $B -R $R -b $SFTPCMDFILE \
                 > /dev/null 2>&1
                 r=$?
                 if [ $r -ne 0 ]; then