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 /dns.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 'dns.c')
-rw-r--r-- | dns.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dns.c,v 1.28 2012/05/23 03:28:28 djm Exp $ */ | 1 | /* $OpenBSD: dns.c,v 1.29 2013/05/17 00:13:13 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2003 Wesley Griffin. All rights reserved. | 4 | * Copyright (c) 2003 Wesley Griffin. All rights reserved. |
@@ -273,7 +273,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address, | |||
273 | 273 | ||
274 | if (hostkey_digest_type != dnskey_digest_type) { | 274 | if (hostkey_digest_type != dnskey_digest_type) { |
275 | hostkey_digest_type = dnskey_digest_type; | 275 | hostkey_digest_type = dnskey_digest_type; |
276 | xfree(hostkey_digest); | 276 | free(hostkey_digest); |
277 | 277 | ||
278 | /* Initialize host key parameters */ | 278 | /* Initialize host key parameters */ |
279 | if (!dns_read_key(&hostkey_algorithm, | 279 | if (!dns_read_key(&hostkey_algorithm, |
@@ -293,10 +293,10 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address, | |||
293 | hostkey_digest_len) == 0) | 293 | hostkey_digest_len) == 0) |
294 | *flags |= DNS_VERIFY_MATCH; | 294 | *flags |= DNS_VERIFY_MATCH; |
295 | } | 295 | } |
296 | xfree(dnskey_digest); | 296 | free(dnskey_digest); |
297 | } | 297 | } |
298 | 298 | ||
299 | xfree(hostkey_digest); /* from key_fingerprint_raw() */ | 299 | free(hostkey_digest); /* from key_fingerprint_raw() */ |
300 | freerrset(fingerprints); | 300 | freerrset(fingerprints); |
301 | 301 | ||
302 | if (*flags & DNS_VERIFY_FOUND) | 302 | if (*flags & DNS_VERIFY_FOUND) |
@@ -339,7 +339,7 @@ export_dns_rr(const char *hostname, Key *key, FILE *f, int generic) | |||
339 | for (i = 0; i < rdata_digest_len; i++) | 339 | for (i = 0; i < rdata_digest_len; i++) |
340 | fprintf(f, "%02x", rdata_digest[i]); | 340 | fprintf(f, "%02x", rdata_digest[i]); |
341 | fprintf(f, "\n"); | 341 | fprintf(f, "\n"); |
342 | xfree(rdata_digest); /* from key_fingerprint_raw() */ | 342 | free(rdata_digest); /* from key_fingerprint_raw() */ |
343 | success = 1; | 343 | success = 1; |
344 | } | 344 | } |
345 | } | 345 | } |