Reset HOME for "sudo -i" even if HOME was listed in env_keep.

--HG--
branch : 1.7

diff --git a/env.c b/env.c
index d2562a2a3be4499eb5f016c2ffb07dfd188a3656..37762fe9e7619f0746d6ff01a50a48b3120f42c6 100644 (file)
--- 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;
 
        /*