diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /regress/sftp-badcmds.sh | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'regress/sftp-badcmds.sh')
-rw-r--r-- | regress/sftp-badcmds.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh index b48b1cb01..08009f26b 100644 --- a/regress/sftp-badcmds.sh +++ b/regress/sftp-badcmds.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sftp-badcmds.sh,v 1.3 2008/03/24 21:46:54 djm Exp $ | 1 | # $OpenBSD: sftp-badcmds.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 invalid commands" | 4 | tid="sftp invalid commands" |
@@ -13,13 +13,13 @@ rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd | |||
13 | 13 | ||
14 | rm -f ${COPY} | 14 | rm -f ${COPY} |
15 | verbose "$tid: get nonexistent" | 15 | verbose "$tid: get nonexistent" |
16 | echo "get $NONEXIST $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 16 | echo "get $NONEXIST $COPY" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
17 | || fail "get nonexistent failed" | 17 | || fail "get nonexistent failed" |
18 | test -f ${COPY} && fail "existing copy after get nonexistent" | 18 | test -f ${COPY} && fail "existing copy after get nonexistent" |
19 | 19 | ||
20 | rm -f ${COPY}.dd/* | 20 | rm -f ${COPY}.dd/* |
21 | verbose "$tid: glob get to nonexistent directory" | 21 | verbose "$tid: glob get to nonexistent directory" |
22 | echo "get /bin/l* $NONEXIST" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 22 | echo "get /bin/l* $NONEXIST" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
23 | || fail "get nonexistent failed" | 23 | || fail "get nonexistent failed" |
24 | for x in $GLOBFILES; do | 24 | for x in $GLOBFILES; do |
25 | test -f ${COPY}.dd/$x && fail "existing copy after get nonexistent" | 25 | test -f ${COPY}.dd/$x && fail "existing copy after get nonexistent" |
@@ -27,13 +27,13 @@ done | |||
27 | 27 | ||
28 | rm -f ${COPY} | 28 | rm -f ${COPY} |
29 | verbose "$tid: put nonexistent" | 29 | verbose "$tid: put nonexistent" |
30 | echo "put $NONEXIST $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 30 | echo "put $NONEXIST $COPY" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
31 | || fail "put nonexistent failed" | 31 | || fail "put nonexistent failed" |
32 | test -f ${COPY} && fail "existing copy after put nonexistent" | 32 | test -f ${COPY} && fail "existing copy after put nonexistent" |
33 | 33 | ||
34 | rm -f ${COPY}.dd/* | 34 | rm -f ${COPY}.dd/* |
35 | verbose "$tid: glob put to nonexistent directory" | 35 | verbose "$tid: glob put to nonexistent directory" |
36 | echo "put /bin/l* ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 36 | echo "put /bin/l* ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
37 | || fail "put nonexistent failed" | 37 | || fail "put nonexistent failed" |
38 | for x in $GLOBFILES; do | 38 | for x in $GLOBFILES; do |
39 | test -f ${COPY}.dd/$x && fail "existing copy after nonexistent" | 39 | test -f ${COPY}.dd/$x && fail "existing copy after nonexistent" |
@@ -41,7 +41,7 @@ done | |||
41 | 41 | ||
42 | rm -f ${COPY} | 42 | rm -f ${COPY} |
43 | verbose "$tid: rename nonexistent" | 43 | verbose "$tid: rename nonexistent" |
44 | echo "rename $NONEXIST ${COPY}.1" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 44 | echo "rename $NONEXIST ${COPY}.1" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
45 | || fail "rename nonexist failed" | 45 | || fail "rename nonexist failed" |
46 | test -f ${COPY}.1 && fail "file exists after rename nonexistent" | 46 | test -f ${COPY}.1 && fail "file exists after rename nonexistent" |
47 | 47 | ||
@@ -49,7 +49,7 @@ rm -rf ${COPY} ${COPY}.dd | |||
49 | cp $DATA $COPY | 49 | cp $DATA $COPY |
50 | mkdir ${COPY}.dd | 50 | mkdir ${COPY}.dd |
51 | verbose "$tid: rename target exists (directory)" | 51 | verbose "$tid: rename target exists (directory)" |
52 | echo "rename $COPY ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 52 | echo "rename $COPY ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
53 | || fail "rename target exists (directory) failed" | 53 | || fail "rename target exists (directory) failed" |
54 | test -f ${COPY} || fail "oldname missing after rename target exists (directory)" | 54 | test -f ${COPY} || fail "oldname missing after rename target exists (directory)" |
55 | test -d ${COPY}.dd || fail "newname missing after rename target exists (directory)" | 55 | test -d ${COPY}.dd || fail "newname missing after rename target exists (directory)" |
@@ -59,7 +59,7 @@ rm -f ${COPY}.dd/* | |||
59 | rm -rf ${COPY} | 59 | rm -rf ${COPY} |
60 | cp ${DATA2} ${COPY} | 60 | cp ${DATA2} ${COPY} |
61 | verbose "$tid: glob put files to local file" | 61 | verbose "$tid: glob put files to local file" |
62 | echo "put /bin/l* $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 | 62 | echo "put /bin/l* $COPY" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 |
63 | cmp ${DATA2} ${COPY} || fail "put successed when it should have failed" | 63 | cmp ${DATA2} ${COPY} || fail "put successed when it should have failed" |
64 | 64 | ||
65 | rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd | 65 | rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd |