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 /ssh-vulnkey.c | |
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 'ssh-vulnkey.c')
-rw-r--r-- | ssh-vulnkey.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ssh-vulnkey.c b/ssh-vulnkey.c index f8125e0bb..ca1a5be74 100644 --- a/ssh-vulnkey.c +++ b/ssh-vulnkey.c | |||
@@ -94,7 +94,7 @@ describe_key(const char *filename, u_long linenum, const char *msg, | |||
94 | printf(":%lu: %s: %s %u %s %s\n", linenum, msg, | 94 | printf(":%lu: %s: %s %u %s %s\n", linenum, msg, |
95 | key_type(key), key_size(key), fp, comment); | 95 | key_type(key), key_size(key), fp, comment); |
96 | } | 96 | } |
97 | xfree(fp); | 97 | free(fp); |
98 | } | 98 | } |
99 | 99 | ||
100 | static int | 100 | static int |
@@ -247,8 +247,7 @@ do_filename(const char *filename, int quiet_open) | |||
247 | ret = 0; | 247 | ret = 0; |
248 | found = 1; | 248 | found = 1; |
249 | } | 249 | } |
250 | if (comment) | 250 | free(comment); |
251 | xfree(comment); | ||
252 | } | 251 | } |
253 | 252 | ||
254 | return ret; | 253 | return ret; |
@@ -282,12 +281,12 @@ do_user(const char *dir) | |||
282 | for (i = 0; default_files[i]; i++) { | 281 | for (i = 0; default_files[i]; i++) { |
283 | xasprintf(&file, "%s/%s", dir, default_files[i]); | 282 | xasprintf(&file, "%s/%s", dir, default_files[i]); |
284 | if (stat(file, &st) < 0 && errno == ENOENT) { | 283 | if (stat(file, &st) < 0 && errno == ENOENT) { |
285 | xfree(file); | 284 | free(file); |
286 | continue; | 285 | continue; |
287 | } | 286 | } |
288 | if (!do_filename(file, 0)) | 287 | if (!do_filename(file, 0)) |
289 | ret = 0; | 288 | ret = 0; |
290 | xfree(file); | 289 | free(file); |
291 | } | 290 | } |
292 | 291 | ||
293 | return ret; | 292 | return ret; |