diff options
| author | Steve Langasek <vorlon@debian.org> | 2010-10-11 19:33:44 +0000 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2010-10-11 19:33:44 +0000 |
| commit | f4aba7f47b87984fda3c5533b03b08a85e4ce81b (patch) | |
| tree | 2f2a067b9337265f43a28452a7a3309bc4636bcd | |
| parent | 4c430f6f8391555bb1b7b78991afb20d35228efc (diff) | |
| download | pam-f4aba7f47b87984fda3c5533b03b08a85e4ce81b.tar.gz pam-f4aba7f47b87984fda3c5533b03b08a85e4ce81b.tar.bz2 pam-f4aba7f47b87984fda3c5533b03b08a85e4ce81b.zip | |
revert preceding patch; under discussion, no consensus
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | modules/pam_env/pam_env.8.xml | 5 | ||||
| -rw-r--r-- | modules/pam_env/pam_env.c | 2 |
3 files changed, 2 insertions, 11 deletions
@@ -1,8 +1,3 @@ -2010-10-11 Tomas Mraz <t8m@centrum.cz> - - * modules/pam_env/pam_env.c: Change default for user_readenv to 0. - * modules/pam_env/pam_env.8.xml: Document the new default for user_readenv. - 2010-10-07 Dmitry V. Levin <ldv@altlinux.org> * modules/pam_selinux/pam_selinux.c (verbose_message): Fix format @@ -45,7 +40,6 @@ * modules/pam_xauth/pam_xauth.c (check_acl): Ensure that the given access control file is a regular file. ->>>>>>> 1.530 2010-09-16 Dmitry V. Levin <ldv@altlinux.org> * modules/pam_env/pam_env.c (handle_env): Use setfsuid() return code. 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" |