pam_env: Change the default to not read the user .pam_environment file

t8m · t8m · commit f83fb5f25263 · 2020-02-24T18:50:54.000+01:00
* modules/pam_env/pam_env.8.xml: Document the change.
* modules/pam_env/pam_env.c: Set DEFAULT_USER_READ_ENVFILE to 0.
diff --git a/modules/pam_env/pam_env.8.xml b/modules/pam_env/pam_env.8.xml
@@ -67,7 +67,7 @@
     <para>
       Third it will read a user configuration file
       (<filename>$HOME/.pam_environment</filename> by default).
-      The default file file can be changed with the
+      The default file can be changed with the
       <emphasis>user_envfile</emphasis> option
       and it can be turned on and off with the <emphasis>user_readenv</emphasis> option.
     </para>
@@ -143,7 +143,7 @@
           <para>
             Indicate an alternative <filename>.pam_environment</filename>
             file to override the default.The syntax is the same as
-	    for <emphasis>/etc/environment</emphasis>.
+	    for <emphasis>/etc/security/pam_env.conf</emphasis>.
 	    The filename is relative to the user home directory.
 	    This can be useful when different services need different
 	    environments.
@@ -158,7 +158,7 @@
         <listitem>
           <para>
             Turns on or off the reading of the user specific environment
-            file. 0 is off, 1 is on. By default this option is on.
+            file. 0 is off, 1 is on. By default this option is off.
           </para>
         </listitem>
       </varlistentry>
diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c
@@ -10,7 +10,7 @@
 #define DEFAULT_READ_ENVFILE    1
 
 #define DEFAULT_USER_ENVFILE    ".pam_environment"
-#define DEFAULT_USER_READ_ENVFILE 1
+#define DEFAULT_USER_READ_ENVFILE 0
 
 #include "config.h"
 
