From: Bdale Garbee <bdale@gag.com>
Date: Tue, 25 Sep 2012 16:29:16 +0000 (-0600)
Subject: oops, missed block move in the merge now fixed
X-Git-Tag: 1.8.5p2-1_bpo60+1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=13691493091367cc4e15a2b7ff3cc104714b3990;p=debian%2Fsudo

oops, missed block move in the merge now fixed
---

diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c
index 962228c..9b043b2 100644
--- 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;