From: tedu <tedu@openbsd.org>
Date: Thu, 22 Oct 2015 12:43:26 +0000 (+0000)
Subject: copying of the environment can be done later, as the user running
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=92e88ce88f3d9e62cb8d193d42b36c3f2a1bb899;p=openbsd

copying of the environment can be done later, as the user running
---

diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c
index bf12f2c2380..3e6d4bbe8b0 100644
--- a/usr.bin/doas/doas.c
+++ b/usr.bin/doas/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.43 2015/10/22 04:57:20 deraadt Exp $ */
+/* $OpenBSD: doas.c,v 1.44 2015/10/22 12:43:26 tedu Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -417,8 +417,6 @@ main(int argc, char **argv, char **envp)
 	if (pledge("stdio rpath getpw exec id", NULL) == -1)
 		err(1, "pledge");
 
-	envp = copyenv((const char **)envp, rule);
-
 	pw = getpwuid(target);
 	if (!pw)
 		errx(1, "no passwd entry for target");
@@ -445,6 +443,8 @@ main(int argc, char **argv, char **envp)
 	syslog(LOG_AUTHPRIV | LOG_INFO, "%s ran command %s as %s from %s",
 	    myname, cmdline, pw->pw_name, cwd);
 
+	envp = copyenv((const char **)envp, rule);
+
 	if (rule->cmd) {
 		if (setenv("PATH", safepath, 1) == -1)
 			err(1, "failed to set PATH '%s'", safepath);