Don't read /etc/environment on Linux when using PAM, PAM should set

the environment variables as needed via pam_env.

--HG--
branch : 1.7

diff --git a/sudo.c b/sudo.c
index 1efbbb6c6be1911a94d613c5b607ba3233925deb..626c599f13bd2704a27e43deed1bbb4370cade1e 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -526,7 +526,7 @@ main(argc, argv, envp)
                NewArgv[1] = "--login";
            }
 
-#if defined(__linux__) || defined(_AIX)
+#if defined(_AIX) || (defined(__linux__) && !defined(HAVE_PAM))
            /* Insert system-wide environment variables. */
            read_env_file(_PATH_ENVIRONMENT, TRUE);
 #endif