diff options
Diffstat (limited to 'modules/pam_env')
-rw-r--r-- | modules/pam_env/pam_env.8.xml | 6 | ||||
-rw-r--r-- | modules/pam_env/pam_env.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/pam_env/pam_env.8.xml b/modules/pam_env/pam_env.8.xml index 105f923f..b765e527 100644 --- 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 index 44625b80..c169ae0b 100644 --- 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" |