Dmitry Belyavskiy c5e4c2
diff --git a/misc.c b/misc.c
Dmitry Belyavskiy c5e4c2
index b8d1040d..0134d694 100644
Dmitry Belyavskiy c5e4c2
--- a/misc.c
Dmitry Belyavskiy c5e4c2
+++ b/misc.c
Dmitry Belyavskiy c5e4c2
@@ -1,4 +1,4 @@
Dmitry Belyavskiy c5e4c2
-/* $OpenBSD: misc.c,v 1.169 2021/08/09 23:47:44 djm Exp $ */
Dmitry Belyavskiy c5e4c2
+/* $OpenBSD: misc.c,v 1.170 2021/09/26 14:01:03 djm Exp $ */
Dmitry Belyavskiy c5e4c2
 /*
Dmitry Belyavskiy c5e4c2
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
Dmitry Belyavskiy c5e4c2
  * Copyright (c) 2005-2020 Damien Miller.  All rights reserved.
Dmitry Belyavskiy c5e4c2
@@ -56,6 +56,7 @@
Dmitry Belyavskiy c5e4c2
 #ifdef HAVE_PATHS_H
Dmitry Belyavskiy c5e4c2
 # include <paths.h>
Dmitry Belyavskiy c5e4c2
 #include <pwd.h>
Dmitry Belyavskiy c5e4c2
+#include <grp.h>
Dmitry Belyavskiy c5e4c2
 #endif
Dmitry Belyavskiy c5e4c2
 #ifdef SSH_TUN_OPENBSD
Dmitry Belyavskiy c5e4c2
 #include <net/if.h>
Dmitry Belyavskiy c5e4c2
@@ -2695,6 +2696,12 @@ subprocess(const char *tag, const char *command,
Dmitry Belyavskiy c5e4c2
 		}
Dmitry Belyavskiy c5e4c2
 		closefrom(STDERR_FILENO + 1);
Dmitry Belyavskiy c5e4c2
 
Dmitry Belyavskiy c5e4c2
+		if (geteuid() == 0 &&
Dmitry Belyavskiy c5e4c2
+		    initgroups(pw->pw_name, pw->pw_gid) == -1) {
Dmitry Belyavskiy c5e4c2
+			error("%s: initgroups(%s, %u): %s", tag,
Dmitry Belyavskiy c5e4c2
+			    pw->pw_name, (u_int)pw->pw_gid, strerror(errno));
Dmitry Belyavskiy c5e4c2
+			_exit(1);
Dmitry Belyavskiy c5e4c2
+		}
Dmitry Belyavskiy c5e4c2
 		if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1) {
Dmitry Belyavskiy c5e4c2
 			error("%s: setresgid %u: %s", tag, (u_int)pw->pw_gid,
Dmitry Belyavskiy c5e4c2
 			    strerror(errno));