- 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, 2 insertions, 2 deletions

diff --git a/regress/sftp-glob.sh b/regress/sftp-glob.sh
index 60116a748..72bb17d75 100644
--- a/regress/sftp-glob.sh
+++ b/regress/sftp-glob.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: sftp-glob.sh,v 1.3 2007/10/26 05:30:01 djm Exp $
+#       $OpenBSD: sftp-glob.sh,v 1.4 2009/08/13 01:11:55 djm Exp $
 #       Placed in the Public Domain.
 
 tid="sftp glob"
@@ -10,7 +10,7 @@ sftp_ls() {
         unexpected=$4
         verbose "$tid: $errtag"
         printf "ls -l %s" "${target}" | \
-                ${SFTP} -b - -P ${SFTPSERVER} 2>/dev/null | \
+                ${SFTP} -b - -D ${SFTPSERVER} 2>/dev/null | \
                 grep -v "^sftp>" > ${RESULTS}
         if [ $? -ne 0 ]; then
                 fail "$errtag failed"