summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-server.ssh.pam3
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f7c971c62..0e341bdb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
1openssh (1:4.3p2-4) UNRELEASED; urgency=low 1openssh (1:4.3p2-4) UNRELEASED; urgency=low
2 2
3 * Read /etc/default/locale as well as /etc/environment (thanks, Raphaël
4 Hertzog; closes: #369395).
3 * debconf template translations: 5 * debconf template translations:
4 - Update Portuguese (thanks, Rui Branco; closes: #381942). 6 - Update Portuguese (thanks, Rui Branco; closes: #381942).
5 - Update Spanish (thanks, Javier Fernández-Sanguino Peña; 7 - 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 @@
3# Read environment variables from /etc/environment and 3# Read environment variables from /etc/environment and
4# /etc/security/pam_env.conf. 4# /etc/security/pam_env.conf.
5auth required pam_env.so # [1] 5auth required pam_env.so # [1]
6# In Debian 4.0 (etch), locale-related environment variables were moved to
7# /etc/default/locale, so read that as well.
8auth required pam_env.so envfile=/etc/default/locale
6 9
7# Standard Un*x authentication. 10# Standard Un*x authentication.
8@include common-auth 11@include common-auth