summaryrefslogtreecommitdiff
path: root/modules/pam_env
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2010-10-11 19:33:44 +0000
committerSteve Langasek <vorlon@debian.org>2010-10-11 19:33:44 +0000
commitf4aba7f47b87984fda3c5533b03b08a85e4ce81b (patch)
tree2f2a067b9337265f43a28452a7a3309bc4636bcd /modules/pam_env
parent4c430f6f8391555bb1b7b78991afb20d35228efc (diff)
revert preceding patch; under discussion, no consensus
Diffstat (limited to 'modules/pam_env')
-rw-r--r--modules/pam_env/pam_env.8.xml5
-rw-r--r--modules/pam_env/pam_env.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/modules/pam_env/pam_env.8.xml b/modules/pam_env/pam_env.8.xml
index b85fbaae..536cb132 100644
--- a/modules/pam_env/pam_env.8.xml
+++ b/modules/pam_env/pam_env.8.xml
@@ -143,10 +143,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 off as user
- supplied environment variables in the PAM environment could affect
- behavior of subsequent modules in the stack without the consent
- of the system administrator.
+ file. 0 is off, 1 is on. By default this option is on.
</para>
</listitem>
</varlistentry>
diff --git a/modules/pam_env/pam_env.c b/modules/pam_env/pam_env.c
index 6be39ba3..8ac8ed33 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 0
+#define DEFAULT_USER_READ_ENVFILE 1
#include "config.h"