diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /regress/sftp-cmds.sh | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'regress/sftp-cmds.sh')
-rw-r--r-- | regress/sftp-cmds.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh index 2e0300e16..aad7fcac2 100644 --- a/regress/sftp-cmds.sh +++ b/regress/sftp-cmds.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sftp-cmds.sh,v 1.12 2012/06/01 00:52:52 djm Exp $ | 1 | # $OpenBSD: sftp-cmds.sh,v 1.14 2013/06/21 02:26:26 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | # XXX - TODO: | 4 | # XXX - TODO: |
@@ -7,8 +7,6 @@ | |||
7 | 7 | ||
8 | tid="sftp commands" | 8 | tid="sftp commands" |
9 | 9 | ||
10 | DATA=/bin/ls${EXEEXT} | ||
11 | COPY=${OBJ}/copy | ||
12 | # test that these files are readable! | 10 | # test that these files are readable! |
13 | for i in `(cd /bin;echo l*)` | 11 | for i in `(cd /bin;echo l*)` |
14 | do | 12 | do |
@@ -108,7 +106,7 @@ rm -f ${COPY}.dd/* | |||
108 | verbose "$tid: get to directory" | 106 | verbose "$tid: get to directory" |
109 | echo "get $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ | 107 | echo "get $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
110 | || fail "get failed" | 108 | || fail "get failed" |
111 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get" | 109 | cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after get" |
112 | 110 | ||
113 | rm -f ${COPY}.dd/* | 111 | rm -f ${COPY}.dd/* |
114 | verbose "$tid: glob get to directory" | 112 | verbose "$tid: glob get to directory" |
@@ -122,7 +120,7 @@ rm -f ${COPY}.dd/* | |||
122 | verbose "$tid: get to local dir" | 120 | verbose "$tid: get to local dir" |
123 | (echo "lcd ${COPY}.dd"; echo "get $DATA" ) | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ | 121 | (echo "lcd ${COPY}.dd"; echo "get $DATA" ) | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
124 | || fail "get failed" | 122 | || fail "get failed" |
125 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get" | 123 | cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after get" |
126 | 124 | ||
127 | rm -f ${COPY}.dd/* | 125 | rm -f ${COPY}.dd/* |
128 | verbose "$tid: glob get to local dir" | 126 | verbose "$tid: glob get to local dir" |
@@ -156,7 +154,7 @@ rm -f ${COPY}.dd/* | |||
156 | verbose "$tid: put to directory" | 154 | verbose "$tid: put to directory" |
157 | echo "put $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ | 155 | echo "put $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
158 | || fail "put failed" | 156 | || fail "put failed" |
159 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put" | 157 | cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after put" |
160 | 158 | ||
161 | rm -f ${COPY}.dd/* | 159 | rm -f ${COPY}.dd/* |
162 | verbose "$tid: glob put to directory" | 160 | verbose "$tid: glob put to directory" |
@@ -170,7 +168,7 @@ rm -f ${COPY}.dd/* | |||
170 | verbose "$tid: put to local dir" | 168 | verbose "$tid: put to local dir" |
171 | (echo "cd ${COPY}.dd"; echo "put $DATA") | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ | 169 | (echo "cd ${COPY}.dd"; echo "put $DATA") | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \ |
172 | || fail "put failed" | 170 | || fail "put failed" |
173 | cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put" | 171 | cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after put" |
174 | 172 | ||
175 | rm -f ${COPY}.dd/* | 173 | rm -f ${COPY}.dd/* |
176 | verbose "$tid: glob put to local dir" | 174 | verbose "$tid: glob put to local dir" |