summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--debian/login.pam5
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 669c40cc..34ff5916 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
shadow (1:4.1.5.1-2) UNRELEASED; urgency=low
+ [ Christian Perrier ]
* Complete Polish translation of logoutd(8. Closes: #668880
+ [ Roger Leigh ]
+ * Separation of static and dynamic motd components in login PAM module
+ Closes: #669698
+
-- Christian Perrier <bubulle@debian.org> Sun, 15 Apr 2012 12:54:24 +0200
shadow (1:4.1.5.1-1) unstable; urgency=low
diff --git a/debian/login.pam b/debian/login.pam
index f1e43b21..1c8af15f 100644
--- a/debian/login.pam
+++ b/debian/login.pam
@@ -80,8 +80,11 @@ session required pam_limits.so
# (Replaces the `LASTLOG_ENAB' option from login.defs)
session optional pam_lastlog.so
-# Prints the motd upon succesful login
+# Prints the message of the day upon succesful login.
# (Replaces the `MOTD_FILE' option in login.defs)
+# 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
session optional pam_motd.so
# Prints the status of the user's mailbox upon succesful login