From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 19 Jan 2012 17:55:23 +0000 (-0500)
Subject: When setting up the execution environment, set groups before gid/egid
X-Git-Tag: SUDO_1_8_4~45^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66a66729af73619967a377d5052c0030d3fd29a1;p=sudo

When setting up the execution environment, set groups before gid/egid
like sudo 1.7 did.
---

diff --git a/src/sudo.c b/src/sudo.c
index 4d976b91a..5aeb7ec71 100644
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -988,6 +988,14 @@ exec_setup(struct command_details *details, const char *ptyname, int ptyfd)
     /*
      * Set groups, including supplementary group vector.
      */
+    if (!ISSET(details->flags, CD_PRESERVE_GROUPS)) {
+	if (details->ngroups >= 0) {
+	    if (sudo_setgroups(details->ngroups, details->groups) < 0) {
+		warning(_("unable to set supplementary group IDs"));
+		goto done;
+	    }
+	}
+    }
 #ifdef HAVE_SETEUID
     if (ISSET(details->flags, CD_SET_EGID) && setegid(details->egid)) {
 	warning(_("unable to set effective gid to runas gid %u"),
@@ -1001,15 +1009,6 @@ exec_setup(struct command_details *details, const char *ptyname, int ptyfd)
 	goto done;
     }
 
-    if (!ISSET(details->flags, CD_PRESERVE_GROUPS)) {
-	if (details->ngroups >= 0) {
-	    if (sudo_setgroups(details->ngroups, details->groups) < 0) {
-		warning(_("unable to set supplementary group IDs"));
-		goto done;
-	    }
-	}
-    }
-
     if (ISSET(details->flags, CD_SET_PRIORITY)) {
 	if (setpriority(PRIO_PROCESS, 0, details->priority) != 0) {
 	    warning(_("unable to set process priority"));