From cae62ebe995b85dc99b52e0953bcbd7ee1a4551a Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Tue, 14 Sep 2010 11:28:41 -0400
Subject: [PATCH] Reset HOME for "sudo -i" even if HOME was listed in env_keep.

--HG--
branch : 1.7
---
 env.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/env.c b/env.c
index d2562a2a3..37762fe9e 100644
--- a/env.c
+++ b/env.c
@@ -702,8 +702,8 @@ rebuild_env(noexec)
 		sudo_setenv("USERNAME", user_name, FALSE);
 	}
 
-	/* If we didn't keep HOME, reset it based on target user. */
-	if (!ISSET(didvar, KEPT_HOME))
+	/* If not a login shell and it wasn't kept above, reset HOME. */
+	if (ISSET(sudo_mode, MODE_LOGIN_SHELL) || !ISSET(didvar, KEPT_HOME))
 	    reset_home = TRUE;
 
 	/*
-- 
2.40.0