summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-08-05 08:33:59 +0100
committerColin Watson <cjwatson@debian.org>2014-08-05 08:33:59 +0100
commite61f7c4d94f348cb172e595f2e8a09c7ed201510 (patch)
tree8d4eed8ff88066b5b28ef9002c81bef0233b2e93
parent6e74d993e36261c1f323a2cbcd70d73d9d5435dc (diff)
Pass noupdate to the second call to pam_motd, not the first (thanks, Ken T Takusagawa; closes: #757059).
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-server.sshd.pam.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 21dfeae35..a0c2581b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ openssh (1:6.6p1-7) UNRELEASED; urgency=medium
4 directly. 4 directly.
5 * Use dh-exec to simplify override_dh_install target. 5 * Use dh-exec to simplify override_dh_install target.
6 * Remove several unnecessary entries in debian/*.dirs. 6 * Remove several unnecessary entries in debian/*.dirs.
7 * Pass noupdate to the second call to pam_motd, not the first (thanks, Ken
8 T Takusagawa; closes: #757059).
7 * Debconf translations: 9 * Debconf translations:
8 - Turkish (thanks, Mert Dirik; closes: #756757). 10 - Turkish (thanks, Mert Dirik; closes: #756757).
9 11
diff --git a/debian/openssh-server.sshd.pam.in b/debian/openssh-server.sshd.pam.in
index bbc3dba97..2cad67da6 100644
--- a/debian/openssh-server.sshd.pam.in
+++ b/debian/openssh-server.sshd.pam.in
@@ -30,8 +30,8 @@ session required pam_loginuid.so
30# Print the message of the day upon successful login. 30# Print the message of the day upon successful login.
31# This includes a dynamically generated part from /run/motd.dynamic 31# This includes a dynamically generated part from /run/motd.dynamic
32# and a static (admin-editable) part from /etc/motd. 32# and a static (admin-editable) part from /etc/motd.
33session optional pam_motd.so motd=/run/motd.dynamic noupdate 33session optional pam_motd.so motd=/run/motd.dynamic
34session optional pam_motd.so # [1] 34session optional pam_motd.so noupdate
35 35
36# Print the status of the user's mailbox upon successful login. 36# Print the status of the user's mailbox upon successful login.
37session optional pam_mail.so standard noenv # [1] 37session optional pam_mail.so standard noenv # [1]