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 /sftp-client.h | |
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 'sftp-client.h')
-rw-r--r-- | sftp-client.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sftp-client.h b/sftp-client.h index aef54ef49..111a998c8 100644 --- a/sftp-client.h +++ b/sftp-client.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.h,v 1.20 2010/12/04 00:18:01 djm Exp $ */ | 1 | /* $OpenBSD: sftp-client.h,v 1.21 2013/07/25 00:56:51 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 4 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
@@ -106,13 +106,13 @@ int do_symlink(struct sftp_conn *, char *, char *); | |||
106 | * Download 'remote_path' to 'local_path'. Preserve permissions and times | 106 | * Download 'remote_path' to 'local_path'. Preserve permissions and times |
107 | * if 'pflag' is set | 107 | * if 'pflag' is set |
108 | */ | 108 | */ |
109 | int do_download(struct sftp_conn *, char *, char *, Attrib *, int); | 109 | int do_download(struct sftp_conn *, char *, char *, Attrib *, int, int); |
110 | 110 | ||
111 | /* | 111 | /* |
112 | * Recursively download 'remote_directory' to 'local_directory'. Preserve | 112 | * Recursively download 'remote_directory' to 'local_directory'. Preserve |
113 | * times if 'pflag' is set | 113 | * times if 'pflag' is set |
114 | */ | 114 | */ |
115 | int download_dir(struct sftp_conn *, char *, char *, Attrib *, int, int); | 115 | int download_dir(struct sftp_conn *, char *, char *, Attrib *, int, int, int); |
116 | 116 | ||
117 | /* | 117 | /* |
118 | * Upload 'local_path' to 'remote_path'. Preserve permissions and times | 118 | * Upload 'local_path' to 'remote_path'. Preserve permissions and times |