Merge version 1.8.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/configure.ac b/configure.ac
index 5940f39cd4548e1b24133ce1794f8cfcfeb4d4fc..bcbe4859fe86663174590f25ba7750f94787e0ed 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([nss_nonlocal], [1.7], [andersk@mit.edu])
+AC_INIT([nss_nonlocal], [1.8], [andersk@mit.edu])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 

diff --git a/nonlocal-group.c b/nonlocal-group.c
index 9d2bfa040439a5db3d6945e79446a12a9f65d7d3..ba54ddcb47dd7dbb9831cee00732cad7d0267c60 100644 (file)
--- a/nonlocal-group.c
+++ b/nonlocal-group.c
@@ -473,7 +473,7 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
                    if (newsize > limit)
                        newsize = limit;
                }
-               newgroups = realloc(*groupsp, *size * sizeof((*groupsp)[0]));
+               newgroups = realloc(*groupsp, newsize * sizeof((*groupsp)[0]));
                if (newgroups == NULL) {
                    *errnop = ENOMEM;
                    errno = old_errno;