Skip to content

Commit f83fb5f

Browse files
committed
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.
1 parent 563d21d commit f83fb5f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

modules/pam_env/pam_env.8.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<para>
6868
Third it will read a user configuration file
6969
(<filename>$HOME/.pam_environment</filename> by default).
70-
The default file file can be changed with the
70+
The default file can be changed with the
7171
<emphasis>user_envfile</emphasis> option
7272
and it can be turned on and off with the <emphasis>user_readenv</emphasis> option.
7373
</para>
@@ -143,7 +143,7 @@
143143
<para>
144144
Indicate an alternative <filename>.pam_environment</filename>
145145
file to override the default.The syntax is the same as
146-
for <emphasis>/etc/environment</emphasis>.
146+
for <emphasis>/etc/security/pam_env.conf</emphasis>.
147147
The filename is relative to the user home directory.
148148
This can be useful when different services need different
149149
environments.
@@ -158,7 +158,7 @@
158158
<listitem>
159159
<para>
160160
Turns on or off the reading of the user specific environment
161-
file. 0 is off, 1 is on. By default this option is on.
161+
file. 0 is off, 1 is on. By default this option is off.
162162
</para>
163163
</listitem>
164164
</varlistentry>

modules/pam_env/pam_env.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define DEFAULT_READ_ENVFILE 1
1111

1212
#define DEFAULT_USER_ENVFILE ".pam_environment"
13-
#define DEFAULT_USER_READ_ENVFILE 1
13+
#define DEFAULT_USER_READ_ENVFILE 0
1414

1515
#include "config.h"
1616

0 commit comments

Comments
 (0)