Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
pam_env: Change the default to not read the user .pam_environment file
* modules/pam_env/pam_env.8.xml: Document the change.
* modules/pam_env/pam_env.c: Set DEFAULT_USER_READ_ENVFILE to 0.
  • Loading branch information
t8m committed Feb 24, 2020
1 parent 563d21d commit f83fb5f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions modules/pam_env/pam_env.8.xml
Expand Up @@ -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>
Expand Down Expand Up @@ -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.
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/pam_env/pam_env.c
Expand Up @@ -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"

Expand Down

0 comments on commit f83fb5f

Please sign in to comment.