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

the environment variables as needed via pam_env.

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index fbbcc33613b358a53b97be4b2d117a365ea455bf..33f2dcfe2bc6bae0a4678548c1a972ee5940f610 100644 (file)
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -594,7 +594,7 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
            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