diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-10-07 10:43:57 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-10-07 10:43:57 +1100 |
commit | ed6b0c5fc21807ff771a499fd042a24f963f7291 (patch) | |
tree | 872b22ff1070a261ce0e9b036100466609c1da56 /regress/sftp-glob.sh | |
parent | 287b9329c5fc2e1a177f9608209a35a6c5bf852a (diff) |
- 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
Diffstat (limited to 'regress/sftp-glob.sh')
-rw-r--r-- | regress/sftp-glob.sh | 4 |
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 @@ | |||
1 | # $OpenBSD: sftp-glob.sh,v 1.3 2007/10/26 05:30:01 djm Exp $ | 1 | # $OpenBSD: sftp-glob.sh,v 1.4 2009/08/13 01:11:55 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="sftp glob" | 4 | tid="sftp glob" |
@@ -10,7 +10,7 @@ sftp_ls() { | |||
10 | unexpected=$4 | 10 | unexpected=$4 |
11 | verbose "$tid: $errtag" | 11 | verbose "$tid: $errtag" |
12 | printf "ls -l %s" "${target}" | \ | 12 | printf "ls -l %s" "${target}" | \ |
13 | ${SFTP} -b - -P ${SFTPSERVER} 2>/dev/null | \ | 13 | ${SFTP} -b - -D ${SFTPSERVER} 2>/dev/null | \ |
14 | grep -v "^sftp>" > ${RESULTS} | 14 | grep -v "^sftp>" > ${RESULTS} |
15 | if [ $? -ne 0 ]; then | 15 | if [ $? -ne 0 ]; then |
16 | fail "$errtag failed" | 16 | fail "$errtag failed" |