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-batch.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-batch.sh')
-rw-r--r-- | regress/sftp-batch.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/regress/sftp-batch.sh b/regress/sftp-batch.sh index 365c47cfc..a51ef0782 100644 --- a/regress/sftp-batch.sh +++ b/regress/sftp-batch.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sftp-batch.sh,v 1.3 2004/01/13 09:49:06 djm Exp $ | 1 | # $OpenBSD: sftp-batch.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 batchfile" | 4 | tid="sftp batchfile" |
@@ -37,19 +37,19 @@ cat << EOF > ${BATCH}.fail.2 | |||
37 | EOF | 37 | EOF |
38 | 38 | ||
39 | verbose "$tid: good commands" | 39 | verbose "$tid: good commands" |
40 | ${SFTP} -b ${BATCH}.pass.1 -P ${SFTPSERVER} >/dev/null 2>&1 \ | 40 | ${SFTP} -b ${BATCH}.pass.1 -D ${SFTPSERVER} >/dev/null 2>&1 \ |
41 | || fail "good commands failed" | 41 | || fail "good commands failed" |
42 | 42 | ||
43 | verbose "$tid: bad commands" | 43 | verbose "$tid: bad commands" |
44 | ${SFTP} -b ${BATCH}.fail.1 -P ${SFTPSERVER} >/dev/null 2>&1 \ | 44 | ${SFTP} -b ${BATCH}.fail.1 -D ${SFTPSERVER} >/dev/null 2>&1 \ |
45 | && fail "bad commands succeeded" | 45 | && fail "bad commands succeeded" |
46 | 46 | ||
47 | verbose "$tid: comments and blanks" | 47 | verbose "$tid: comments and blanks" |
48 | ${SFTP} -b ${BATCH}.pass.2 -P ${SFTPSERVER} >/dev/null 2>&1 \ | 48 | ${SFTP} -b ${BATCH}.pass.2 -D ${SFTPSERVER} >/dev/null 2>&1 \ |
49 | || fail "comments & blanks failed" | 49 | || fail "comments & blanks failed" |
50 | 50 | ||
51 | verbose "$tid: junk command" | 51 | verbose "$tid: junk command" |
52 | ${SFTP} -b ${BATCH}.fail.2 -P ${SFTPSERVER} >/dev/null 2>&1 \ | 52 | ${SFTP} -b ${BATCH}.fail.2 -D ${SFTPSERVER} >/dev/null 2>&1 \ |
53 | && fail "junk command succeeded" | 53 | && fail "junk command succeeded" |
54 | 54 | ||
55 | rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.* | 55 | rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.* |