* 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).

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,
                 printf(":%lu: %s: %s %u %s %s\n", linenum, msg,
                     key_type(key), key_size(key), fp, comment);
         }
-        xfree(fp);
+        free(fp);
 }
 
 static int
@@ -247,8 +247,7 @@ do_filename(const char *filename, int quiet_open)
                                 ret = 0;
                         found = 1;
                 }
-                if (comment)
-                        xfree(comment);
+                free(comment);
         }
 
         return ret;
@@ -282,12 +281,12 @@ do_user(const char *dir)
         for (i = 0; default_files[i]; i++) {
                 xasprintf(&file, "%s/%s", dir, default_files[i]);
                 if (stat(file, &st) < 0 && errno == ENOENT) {
-                        xfree(file);
+                        free(file);
                         continue;
                 }
                 if (!do_filename(file, 0))
                         ret = 0;
-                xfree(file);
+                free(file);
         }
 
         return ret;