* 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/roaming_client.c b/roaming_client.c
index 48009d781..81c496827 100644
--- a/roaming_client.c
+++ b/roaming_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: roaming_client.c,v 1.4 2011/12/07 05:44:38 djm Exp $ */
+/* $OpenBSD: roaming_client.c,v 1.5 2013/05/17 00:13:14 djm Exp $ */
 /*
  * Copyright (c) 2004-2009 AppGate Network Security AB
  *
@@ -187,10 +187,10 @@ roaming_resume(void)
                 debug("server doesn't allow resume");
                 goto fail;
         }
-        xfree(str);
+        free(str);
         for (i = 1; i < PROPOSAL_MAX; i++) {
                 /* kex algorithm taken care of so start with i=1 and not 0 */
-                xfree(packet_get_string(&len));
+                free(packet_get_string(&len));
         }
         i = packet_get_char(); /* first_kex_packet_follows */
         if (i && (c = strchr(kexlist, ',')))
@@ -226,8 +226,7 @@ roaming_resume(void)
         return 0;
 
 fail:
-        if (kexlist)
-                xfree(kexlist);
+        free(kexlist);
         if (packet_get_connection_in() == packet_get_connection_out())
                 close(packet_get_connection_in());
         else {