From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 19 Jul 2010 16:12:03 +0000 (-0400)
Subject: Check KEPT_MAIL not DID_MAIL when determining whether to set MAIL
X-Git-Tag: SUDO_1_7_4~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bd31c7bff53420154e191f83b9785ea00c1b06a;p=sudo

Check KEPT_MAIL not DID_MAIL when determining whether to set MAIL
in -i and env_reset mode.

--HG--
branch : 1.7
---

diff --git a/env.c b/env.c
index 84e2e74ea..6ad32992f 100644
--- a/env.c
+++ b/env.c
@@ -700,7 +700,7 @@ rebuild_env(noexec)
 	 * Set MAIL to target user in -i mode or if MAIL is not preserved
 	 * from user's environment.
 	 */
-	if (ISSET(sudo_mode, MODE_LOGIN_SHELL) || !ISSET(didvar, DID_MAIL)) {
+	if (ISSET(sudo_mode, MODE_LOGIN_SHELL) || !ISSET(didvar, KEPT_MAIL)) {
 	    cp = _PATH_MAILDIR;
 	    if (cp[sizeof(_PATH_MAILDIR) - 2] == '/')
 		easprintf(&cp, "MAIL=%s%s", _PATH_MAILDIR, runas_pw->pw_name);