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

[Christian Perrier]

Author: bubulle
Date: 2006-05-20 06:22:31 +0000 (Sat, 20 May 2006)
New Revision: 998

Modified:
   trunk/debian/changelog
   trunk/debian/login.pam
Log:
Close the PAM reading locale bug with the next release


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-05-18 17:55:22 UTC (rev 997)
+++ trunk/debian/changelog	2006-05-20 06:22:31 UTC (rev 998)
@@ -1,3 +1,11 @@
+shadow (1:4.0.15-11) UNRELEASED; urgency=low
+
+  * The "Emmenthal" release
+  * Reading /etc/default/locale is back in login PAM config file
+    after brainstorming with Steve. Closes: #368102
+
+ -- Christian Perrier <bubulle at debian.org>  Thu, 18 May 2006 23:20:28 -0500
+
 shadow (1:4.0.15-10) unstable; urgency=low
 
   * The "Morbier" release

Modified: trunk/debian/login.pam
===================================================================
--- trunk/debian/login.pam	2006-05-18 17:55:22 UTC (rev 997)
+++ trunk/debian/login.pam	2006-05-20 06:22:31 UTC (rev 998)
@@ -20,6 +20,9 @@
 # 
 # parsing /etc/environment needs "readenv=1"
 session       required   pam_env.so readenv=1
+# locale variables are also kept into /etc/default/locale in etch
+# reading this file *in addition to /etc/environment* does not hurt
+session       required   pam_env.so readenv=1 envfile=/etc/default/locale
 
 # Standard Un*x authentication.
 @include common-auth