* 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, 5 insertions, 4 deletions

diff --git a/groupaccess.c b/groupaccess.c
index 2381aeb15..1eab10b19 100644
--- a/groupaccess.c
+++ b/groupaccess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: groupaccess.c,v 1.13 2008/07/04 03:44:59 djm Exp $ */
+/* $OpenBSD: groupaccess.c,v 1.14 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Copyright (c) 2001 Kevin Steves.  All rights reserved.
  *
@@ -31,6 +31,7 @@
 #include <grp.h>
 #include <unistd.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "xmalloc.h"
@@ -68,7 +69,7 @@ ga_init(const char *user, gid_t base)
         for (i = 0, j = 0; i < ngroups; i++)
                 if ((gr = getgrgid(groups_bygid[i])) != NULL)
                         groups_byname[j++] = xstrdup(gr->gr_name);
-        xfree(groups_bygid);
+        free(groups_bygid);
         return (ngroups = j);
 }
 
@@ -122,8 +123,8 @@ ga_free(void)
 
         if (ngroups > 0) {
                 for (i = 0; i < ngroups; i++)
-                        xfree(groups_byname[i]);
+                        free(groups_byname[i]);
                 ngroups = 0;
-                xfree(groups_byname);
+                free(groups_byname);
         }
 }