diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-24 05:41:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-24 05:41:25 +0000 |
| commit | 7603ea28d333d47f8e45e33515362ec55d381877 (patch) | |
| tree | bea0b39db5db660696f86369635be85811b0d165 /nis | |
| parent | cf9e9ad98feb55d11f93aa4e069c81ee06c2a6a3 (diff) | |
| download | glibc-7603ea28d333d47f8e45e33515362ec55d381877.tar glibc-7603ea28d333d47f8e45e33515362ec55d381877.tar.gz glibc-7603ea28d333d47f8e45e33515362ec55d381877.tar.bz2 glibc-7603ea28d333d47f8e45e33515362ec55d381877.zip | |
Update.
* string/endian.h: Explain the _*_ENDIAN constant values a bit
more. Patch by scarlet@mit.edu [PR libc/1799].
* io/ftwtest-sh: Add -f parameter to chmod if -R is also given.
[PR libc/1792].
* argp/argp-parse.c (parser_finalize): Reverse order in which
parsers are run for ARGP_KEY_END. [PR libc/1755].
Diffstat (limited to 'nis')
| -rw-r--r-- | nis/nss_compat/compat-initgroups.c | 19 | ||||
| -rw-r--r-- | nis/nss_nis/nis-initgroups.c | 19 |
2 files changed, 32 insertions, 6 deletions
diff --git a/nis/nss_compat/compat-initgroups.c b/nis/nss_compat/compat-initgroups.c index 4d14615126..558433e0ba 100644 --- a/nis/nss_compat/compat-initgroups.c +++ b/nis/nss_compat/compat-initgroups.c @@ -27,6 +27,7 @@ #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> #include <rpcsvc/nis.h> +#include <sys/param.h> #include <nsswitch.h> #include "nss-nis.h" @@ -589,7 +590,8 @@ internal_getgrent_r (struct group *gr, ent_t *ent, char *buffer, enum nss_status _nss_compat_initgroups_dyn (const char *user, gid_t group, long int *start, - long int *size, gid_t **groupsp, int *errnop) + long int *size, gid_t **groupsp, long int limit, + int *errnop) { struct group grpbuf, *g; size_t buflen = sysconf (_SC_GETPW_R_SIZE_MAX); @@ -631,11 +633,22 @@ _nss_compat_initgroups_dyn (const char *user, gid_t group, long int *start, { /* Need a bigger buffer. */ gid_t *newgroups; - newgroups = realloc (groups, 2 * *size * sizeof (*groups)); + long int newsize; + + if (limit > 0 && *size == limit) + /* We reached the maximum. */ + goto done; + + if (limit <= 0) + newsize = 2 * *size; + else + newsize = MIN (limit, 2 * *size); + + newgroups = realloc (groups, newsize * sizeof (*groups)); if (newgroups == NULL) goto done; *groupsp = groups = newgroups; - *size *= 2; + *size = newsize; } groups[*start] = g->gr_gid; diff --git a/nis/nss_nis/nis-initgroups.c b/nis/nss_nis/nis-initgroups.c index ec13dbd140..cf666a4e4d 100644 --- a/nis/nss_nis/nis-initgroups.c +++ b/nis/nss_nis/nis-initgroups.c @@ -25,6 +25,7 @@ #include <unistd.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> +#include <sys/param.h> #include "nss-nis.h" @@ -138,7 +139,8 @@ internal_getgrent_r (struct group *grp, char *buffer, size_t buflen, enum nss_status _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start, - long int *size, gid_t **groupsp, int *errnop) + long int *size, gid_t **groupsp, long int limit, + int *errnop) { struct group grpbuf, *g; size_t buflen = sysconf (_SC_GETPW_R_SIZE_MAX); @@ -181,11 +183,22 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start, { /* Need a bigger buffer. */ gid_t *newgroups; - newgroups = realloc (groups, 2 * *size * sizeof (*groups)); + long int newsize; + + if (limit > 0 && *size == limit) + /* We reached the maximum. */ + goto done; + + if (limit <= 0) + newsize = 2 * *size; + else + newsize = MIN (limit, 2 * *size); + + newgroups = realloc (groups, newsize * sizeof (*groups)); if (newgroups == NULL) goto done; *groupsp = groups = newgroups; - *size *= 2; + *size = newsize; } groups[*start] = g->gr_gid; |