[Pkg-shadow-commits] r984 - trunk/debian

[Christian Perrier]

Author: bubulle
Date: 2006-05-17 00:43:47 +0000 (Wed, 17 May 2006)
New Revision: 984

Modified:
   trunk/debian/changelog
   trunk/debian/login.pam
   trunk/debian/login.su.pam
Log:
Stop reading /etc/default/locale in su and login PAM configuration files


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-05-10 08:09:41 UTC (rev 983)
+++ trunk/debian/changelog	2006-05-17 00:43:47 UTC (rev 984)
@@ -5,6 +5,9 @@
     - 487_passwd_chauthtok_failed_message: Add an informative message
       When password couldn't be changed in passwd when chauthok fails
       Closes: #352137
+  * Debian packaging fixes:
+    - stop reading /etc/default/locale in addition to /etc/environment
+      in the PAM configuration file for login and su
 
  -- Christian Perrier <bubulle at kheops.frmug.org>  Fri,  5 May 2006 15:59:41 +0200
 

Modified: trunk/debian/login.pam
===================================================================
--- trunk/debian/login.pam	2006-05-10 08:09:41 UTC (rev 983)
+++ trunk/debian/login.pam	2006-05-17 00:43:47 UTC (rev 984)
@@ -20,8 +20,6 @@
 # 
 # parsing /etc/environment needs "readenv=1"
 session       required   pam_env.so readenv=1
-# locale variables are kept into /etc/default/locale in etch
-session       required   pam_env.so readenv=1 envfile=/etc/default/locale
 
 # Standard Un*x authentication.
 @include common-auth

Modified: trunk/debian/login.su.pam
===================================================================
--- trunk/debian/login.su.pam	2006-05-10 08:09:41 UTC (rev 983)
+++ trunk/debian/login.su.pam	2006-05-17 00:43:47 UTC (rev 984)
@@ -34,8 +34,6 @@
 # 
 # parsing /etc/environment needs "readenv=1"
 session       required   pam_env.so readenv=1
-# locale variables are kept into /etc/default/locale in etch
-session       required   pam_env.so readenv=1 envfile=/etc/default/locale
 
 # Defines the MAIL environment variable
 # However, userdel also needs MAIL_DIR and MAIL_FILE variables