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 /groupaccess.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 'groupaccess.c')
-rw-r--r-- | groupaccess.c | 9 |
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 @@ | |||
1 | /* $OpenBSD: groupaccess.c,v 1.13 2008/07/04 03:44:59 djm Exp $ */ | 1 | /* $OpenBSD: groupaccess.c,v 1.14 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Kevin Steves. All rights reserved. | 3 | * Copyright (c) 2001 Kevin Steves. All rights reserved. |
4 | * | 4 | * |
@@ -31,6 +31,7 @@ | |||
31 | #include <grp.h> | 31 | #include <grp.h> |
32 | #include <unistd.h> | 32 | #include <unistd.h> |
33 | #include <stdarg.h> | 33 | #include <stdarg.h> |
34 | #include <stdlib.h> | ||
34 | #include <string.h> | 35 | #include <string.h> |
35 | 36 | ||
36 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
@@ -68,7 +69,7 @@ ga_init(const char *user, gid_t base) | |||
68 | for (i = 0, j = 0; i < ngroups; i++) | 69 | for (i = 0, j = 0; i < ngroups; i++) |
69 | if ((gr = getgrgid(groups_bygid[i])) != NULL) | 70 | if ((gr = getgrgid(groups_bygid[i])) != NULL) |
70 | groups_byname[j++] = xstrdup(gr->gr_name); | 71 | groups_byname[j++] = xstrdup(gr->gr_name); |
71 | xfree(groups_bygid); | 72 | free(groups_bygid); |
72 | return (ngroups = j); | 73 | return (ngroups = j); |
73 | } | 74 | } |
74 | 75 | ||
@@ -122,8 +123,8 @@ ga_free(void) | |||
122 | 123 | ||
123 | if (ngroups > 0) { | 124 | if (ngroups > 0) { |
124 | for (i = 0; i < ngroups; i++) | 125 | for (i = 0; i < ngroups; i++) |
125 | xfree(groups_byname[i]); | 126 | free(groups_byname[i]); |
126 | ngroups = 0; | 127 | ngroups = 0; |
127 | xfree(groups_byname); | 128 | free(groups_byname); |
128 | } | 129 | } |
129 | } | 130 | } |