X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/22616013c4eef383b19b8ad4f95780a316d0a51b..1325a69de3944e18b428a7343961a957cfe7c3dd:/openssh/groupaccess.c

diff --git a/openssh/groupaccess.c b/openssh/groupaccess.c
index 2381aeb..cbfe720 100644
--- a/openssh/groupaccess.c
+++ b/openssh/groupaccess.c
@@ -1,4 +1,5 @@
-/* $OpenBSD: groupaccess.c,v 1.13 2008/07/04 03:44:59 djm Exp $ */
+/*	$OpenBSD: groupaccess.c,v 1.4 2001/06/26 17:27:23 markus Exp $	*/
+
 /*
  * Copyright (c) 2001 Kevin Steves.  All rights reserved.
  *
@@ -25,21 +26,13 @@
 
 #include "includes.h"
 
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <grp.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <string.h>
-
-#include "xmalloc.h"
 #include "groupaccess.h"
+#include "xmalloc.h"
 #include "match.h"
 #include "log.h"
 
 static int ngroups;
-static char **groups_byname;
+static char *groups_byname[NGROUPS_MAX + 1];	/* +1 for base/primary group */
 
 /*
  * Initialize group access list for user with primary (base) and
@@ -48,27 +41,19 @@ static char **groups_byname;
 int
 ga_init(const char *user, gid_t base)
 {
-	gid_t *groups_bygid;
+	gid_t groups_bygid[NGROUPS_MAX + 1];
 	int i, j;
 	struct group *gr;
 
 	if (ngroups > 0)
 		ga_free();
 
-	ngroups = NGROUPS_MAX;
-#if defined(HAVE_SYSCONF) && defined(_SC_NGROUPS_MAX)
-	ngroups = MAX(NGROUPS_MAX, sysconf(_SC_NGROUPS_MAX));
-#endif
-
-	groups_bygid = xcalloc(ngroups, sizeof(*groups_bygid));
-	groups_byname = xcalloc(ngroups, sizeof(*groups_byname));
-
+	ngroups = sizeof(groups_bygid) / sizeof(gid_t);
 	if (getgrouplist(user, base, groups_bygid, &ngroups) == -1)
-		logit("getgrouplist: groups list too small");
+		log("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);
 }
 
@@ -88,30 +73,6 @@ ga_match(char * const *groups, int n)
 	return 0;
 }
 
-/*
- * Return 1 if one of user's groups matches group_pattern list.
- * Return 0 on negated or no match.
- */
-int
-ga_match_pattern_list(const char *group_pattern)
-{
-	int i, found = 0;
-	size_t len = strlen(group_pattern);
-
-	for (i = 0; i < ngroups; i++) {
-		switch (match_pattern_list(groups_byname[i],
-		    group_pattern, len, 0)) {
-		case -1:
-			return 0;	/* Negated match wins */
-		case 0:
-			continue;
-		case 1:
-			found = 1;
-		}
-	}
-	return found;
-}
-
 /*
  * Free memory allocated for group access list.
  */
@@ -124,6 +85,5 @@ ga_free(void)
 		for (i = 0; i < ngroups; i++)
 			xfree(groups_byname[i]);
 		ngroups = 0;
-		xfree(groups_byname);
 	}
 }