- (djm) [groupaccess.c uidswap.c] Bug #787: Size group arrays at runtime

   using sysconf() if available Based on patches from
   holger AT van-lengerich.de and openssh_bugzilla AT hockin.org

1 files changed, 12 insertions, 3 deletions

diff --git a/groupaccess.c b/groupaccess.c
index fbf794fc8..f50879f83 100644
--- a/groupaccess.c
+++ b/groupaccess.c
@@ -31,7 +31,7 @@ RCSID("$OpenBSD: groupaccess.c,v 1.6 2003/04/08 20:21:28 itojun Exp $");
 #include "log.h"
 
 static int ngroups;
-static char *groups_byname[NGROUPS_MAX + 1];    /* +1 for base/primary group */
+static char **groups_byname;
 
 /*
  * Initialize group access list for user with primary (base) and
@@ -40,19 +40,27 @@ static char *groups_byname[NGROUPS_MAX + 1];	/* +1 for base/primary group */
 int
 ga_init(const char *user, gid_t base)
 {
-        gid_t groups_bygid[NGROUPS_MAX + 1];
+        gid_t *groups_bygid;
         int i, j;
         struct group *gr;
 
         if (ngroups > 0)
                 ga_free();
 
-        ngroups = sizeof(groups_bygid) / sizeof(gid_t);
+        ngroups = NGROUPS_MAX;
+#if defined(HAVE_SYSCONF) && defined(_SC_NGROUPS_MAX)
+        ngroups = MAX(NGROUPS_MAX, sysconf(_SC_NGROUPS_MAX));
+#endif
+
+        groups_bygid = xmalloc(ngroups * sizeof(*groups_bygid));
+        groups_byname = xmalloc(ngroups * sizeof(*groups_byname));
+
         if (getgrouplist(user, base, groups_bygid, &ngroups) == -1)
                 logit("getgrouplist: groups list too small");
         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);
         return (ngroups = j);
 }
 
@@ -84,5 +92,6 @@ ga_free(void)
                 for (i = 0; i < ngroups; i++)
                         xfree(groups_byname[i]);
                 ngroups = 0;
+                xfree(groups_byname);
         }
 }