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

[Christian Perrier]

Author: bubulle
Date: 2006-03-27 10:25:18 +0000 (Mon, 27 Mar 2006)
New Revision: 933

Modified:
   trunk/debian/changelog
   trunk/debian/login.pam
   trunk/debian/login.su.pam
Log:
Parse /etc/default/locale by default. #359163


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-27 10:18:07 UTC (rev 932)
+++ trunk/debian/changelog	2006-03-27 10:25:18 UTC (rev 933)
@@ -4,6 +4,9 @@
   * Debian packaging fixes:
     - Only replace manpages-es << 1.55-4. Thanks to Rubén
     - Include chgpasswd in shipped files. Really Closes: #355070
+    - parse /etc/default/locale for locale environment variables in login and
+      su default PAM configuration files. Thanks to Denis Barbier for the
+      patch. Closes: #359163
   * Upstream bugs or fixes not already fixed in upstream releases or CVS:
     - 486_chgpasswd.8: add a manpage for chgpasswd.
 

Modified: trunk/debian/login.pam
===================================================================
--- trunk/debian/login.pam	2006-03-27 10:18:07 UTC (rev 932)
+++ trunk/debian/login.pam	2006-03-27 10:25:18 UTC (rev 933)
@@ -14,12 +14,14 @@
 # (Replaces the `NOLOGINS_FILE' option from login.defs)
 auth       requisite  pam_nologin.so
 
-# This module parses /etc/environment (the standard for setting
-# environ vars) and also allows you to use an extended config
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
 # file /etc/security/pam_env.conf.
 # 
 # parsing /etc/environment needs "readenv=1"
 session       required   pam_env.so readenv=1
+# locale files 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-03-27 10:18:07 UTC (rev 932)
+++ trunk/debian/login.su.pam	2006-03-27 10:25:18 UTC (rev 933)
@@ -28,12 +28,14 @@
 # as well as /etc/porttime)
 # account    requisite  pam_time.so
 
-# This module parses /etc/environment (the standard for setting
-# environ vars) and also allows you to use an extended config
+# This module parses environment configuration file(s)
+# and also allows you to use an extended config
 # file /etc/security/pam_env.conf.
 # 
 # parsing /etc/environment needs "readenv=1"
 session       required   pam_env.so readenv=1
+# locale files 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