From: Damien Miller <djm@mindrot.org>
Date: Fri, 11 Jul 2025 22:36:49 +0000 (-0700)
Subject: more diagnostics when getgrouplist fails
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1052fa62b35e0bb25b0c1efb9fdd7870e4a68ab6;p=thirdparty%2Fopenssh-portable.git

more diagnostics when getgrouplist fails
---

diff --git a/groupaccess.c b/groupaccess.c
index 9d03ded0c..b85782472 100644
--- a/groupaccess.c
+++ b/groupaccess.c
@@ -50,21 +50,24 @@ int
 ga_init(const char *user, gid_t base)
 {
 	gid_t *groups_bygid;
-	int i, j, retry = 0;
+	int ongroups, i, j, retry = 0;
 	struct group *gr;
 
 	if (ngroups > 0)
 		ga_free();
 
-	ngroups = NGROUPS_MAX;
+	ongroups = ngroups = NGROUPS_MAX;
 #if defined(HAVE_SYSCONF) && defined(_SC_NGROUPS_MAX)
-	ngroups = MAX(NGROUPS_MAX, sysconf(_SC_NGROUPS_MAX));
+	ongroups = ngroups = MAX(NGROUPS_MAX, sysconf(_SC_NGROUPS_MAX));
 #endif
 
 	groups_bygid = xcalloc(ngroups, sizeof(*groups_bygid));
 	while (getgrouplist(user, base, groups_bygid, &ngroups) == -1) {
-		if (retry++ > 0)
-			fatal("getgrouplist: groups list too small");
+		if (retry++ > 0) {
+			fatal("getgrouplist(\"%s\", %ld): groups list too big "
+			    "(have %ld, need %ld)", user, (long)base,
+			    (long)ongroups, (long)ngroups);
+		}
 		groups_bygid = xreallocarray(groups_bygid, ngroups,
 		    sizeof(*groups_bygid));
 	}