Pass noupdate to the second call to pam_motd, not the first (thanks, Ken T Takusagawa; closes: #757059).

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
     directly.
   * Use dh-exec to simplify override_dh_install target.
   * Remove several unnecessary entries in debian/*.dirs.
+  * Pass noupdate to the second call to pam_motd, not the first (thanks, Ken
+    T Takusagawa; closes: #757059).
   * Debconf translations:
     - Turkish (thanks, Mert Dirik; closes: #756757).
 
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
 # Print the message of the day upon successful login.
 # This includes a dynamically generated part from /run/motd.dynamic
 # and a static (admin-editable) part from /etc/motd.
-session    optional     pam_motd.so  motd=/run/motd.dynamic noupdate
-session    optional     pam_motd.so # [1]
+session    optional     pam_motd.so  motd=/run/motd.dynamic
+session    optional     pam_motd.so noupdate
 
 # Print the status of the user's mailbox upon successful login.
 session    optional     pam_mail.so standard noenv # [1]