From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 15 Jan 2002 20:39:59 +0000 (+0000)
Subject: Only OR in MODE_RESET_HOME if MODE_RUN is set.
X-Git-Tag: SUDO_1_6_5~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb97ce45ea64d6b5020a9d09189427fffd2e3014;p=sudo

Only OR in MODE_RESET_HOME if MODE_RUN is set.
Fixes a problem where "sudo -l" would not work if always_set_home was set.
---

diff --git a/sudo.c b/sudo.c
index bb4abbf9c..b4578cf36 100644
--- a/sudo.c
+++ b/sudo.c
@@ -312,9 +312,9 @@ main(argc, argv, envp)
     if ((sudo_mode & MODE_IMPLIED_SHELL) && !def_flag(I_SHELL_NOARGS))
 	usage(1);
 
-    /* May need to set $HOME to target user. */
-    if (def_flag(I_ALWAYS_SET_HOME) ||
-	((sudo_mode & MODE_SHELL) && def_flag(I_SET_HOME)))
+    /* May need to set $HOME to target user if we are running a command. */
+    if ((sudo_mode & MODE_RUN) && (def_flag(I_ALWAYS_SET_HOME) ||
+	((sudo_mode & MODE_SHELL) && def_flag(I_SET_HOME))))
 	sudo_mode |= MODE_RESET_HOME;
 
     /* Bail if a tty is required and we don't have one.  */