From f4aba7f47b87984fda3c5533b03b08a85e4ce81b Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 11 Oct 2010 19:33:44 +0000 Subject: revert preceding patch; under discussion, no consensus --- ChangeLog | 6 ------ 1 file changed, 6 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index c7bcac96..17336ac6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,3 @@ -2010-10-11 Tomas Mraz - - * 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 * 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 * modules/pam_env/pam_env.c (handle_env): Use setfsuid() return code. -- cgit v1.2.3