oops, missed block move in the merge now fixed

[debian/sudo] / plugins / sudoers / env.c

diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c
index 962228ccf4e7e985e90ae2b585506fb1f8bc3e76..9b043b282eb756d7a76e9912119a30e03a13da06 100644 (file)
--- a/plugins/sudoers/env.c
+++ b/plugins/sudoers/env.c
@@ -741,15 +741,6 @@ rebuild_env(void)
                env_update_didvar(*ep, &didvar);
        }
 
-    /* Reset HOME based on target user if configured to. */
-    if (ISSET(sudo_mode, MODE_RUN)) {
-       if (def_always_set_home ||
-           ISSET(sudo_mode, MODE_RESET_HOME | MODE_LOGIN_SHELL) || 
-           (ISSET(sudo_mode, MODE_SHELL) && def_set_home))
-           reset_home = TRUE;
-    }
-
-    if (def_env_reset || ISSET(sudo_mode, MODE_LOGIN_SHELL)) {
        /* Pull in vars we want to keep from the old environment. */
        for (ep = old_envp; *ep; ep++) {
            bool keepit;