login: keep default MOTD_FILE= backwardly compatible

It seems that directories like /etc/motd.d are already used by PAM or
by another stuff. Let's keep it in admin/distro hands and do not
change the current default.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/pathnames.h b/include/pathnames.h
index fac3a07831fdc58bf6418b6a20916b574f8ba713..3845d4c3319da23954a5660564e5a6d64ac67516 100644 (file)
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -41,7 +41,7 @@
 #ifndef _PATH_MAILDIR
 # define _PATH_MAILDIR         "/var/spool/mail"
 #endif
-#define        _PATH_MOTDFILE          "/usr/share/misc/motd:/run/motd:/run/motd.d:/etc/motd:/etc/motd.d"
+#define        _PATH_MOTDFILE          "/usr/share/misc/motd:/run/motd:/etc/motd"
 #ifndef _PATH_NOLOGIN
 # define _PATH_NOLOGIN         "/etc/nologin"
 #endif

diff --git a/login-utils/login.1 b/login-utils/login.1
index 24cd7d2bc1b52c5ab0446b996370e57ecaccdd5e..8dc77fa4331c257a3731c7308cc1b78d990a9a85 100644 (file)
--- a/login-utils/login.1
+++ b/login-utils/login.1
@@ -156,7 +156,7 @@ to be displayed upon login.  If the specified path is a directory then displays
 all files with .motd file extension in version-sort order from the directory.
 .PP
 The default value is
-.IR "/usr/share/misc/motd:/run/motd:/run/motd.d:/etc/motd:/etc/motd.d" .
+.IR "/usr/share/misc/motd:/run/motd:/etc/motd" .
 If the
 .B MOTD_FILE
 item is empty or a quiet login is enabled, then the message of the day