===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/misc.c,v
retrieving revision 1.164.2.1
retrieving revision 1.165
diff -u -r1.164.2.1 -r1.165
--- src/usr.bin/ssh/misc.c	2021/09/26 14:03:57	1.164.2.1
+++ src/usr.bin/ssh/misc.c	2021/06/04 05:02:40	1.165
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.164.2.1 2021/09/26 14:03:57 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.165 2021/06/04 05:02:40 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005-2020 Damien Miller.  All rights reserved.
@@ -2525,12 +2525,6 @@
 		}
 		closefrom(STDERR_FILENO + 1);
 
-		if (geteuid() == 0 &&
-		    initgroups(pw->pw_name, pw->pw_gid) == -1) {
-			error("%s: initgroups(%s, %u): %s", tag,
-			    pw->pw_name, (u_int)pw->pw_gid, strerror(errno));
-			_exit(1);
-		}
 		if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1) {
 			error("%s: setresgid %u: %s", tag, (u_int)pw->pw_gid,
 			    strerror(errno));
@@ -2575,4 +2569,19 @@
 	if (child != NULL)
 		*child = f;
 	return pid;
+}
+
+const char *
+lookup_env_in_list(const char *env, char * const *envs, size_t nenvs)
+{
+	size_t i, envlen;
+
+	envlen = strlen(env);
+	for (i = 0; i < nenvs; i++) {
+		if (strncmp(envs[i], env, envlen) == 0 &&
+		    envs[i][envlen] == '=') {
+			return envs[i] + envlen + 1;
+		}
+	}
+	return NULL;
 }