From d6b2fd43bc40553100790e83837fd8ff8a206f09 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 29 Sep 2006 10:05:00 +0000 Subject: * Read /etc/default/locale as well as /etc/environment (thanks, Raphaël Hertzog; closes: #369395). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 ++ debian/openssh-server.ssh.pam | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index f7c971c62..0e341bdb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ openssh (1:4.3p2-4) UNRELEASED; urgency=low + * Read /etc/default/locale as well as /etc/environment (thanks, Raphaël + Hertzog; closes: #369395). * debconf template translations: - Update Portuguese (thanks, Rui Branco; closes: #381942). - Update Spanish (thanks, Javier Fernández-Sanguino Peña; diff --git a/debian/openssh-server.ssh.pam b/debian/openssh-server.ssh.pam index 4939b7e3c..9b7695184 100644 --- a/debian/openssh-server.ssh.pam +++ b/debian/openssh-server.ssh.pam @@ -3,6 +3,9 @@ # Read environment variables from /etc/environment and # /etc/security/pam_env.conf. auth required pam_env.so # [1] +# In Debian 4.0 (etch), locale-related environment variables were moved to +# /etc/default/locale, so read that as well. +auth required pam_env.so envfile=/etc/default/locale # Standard Un*x authentication. @include common-auth -- cgit v1.2.3