diff --git a/shadow-login_defs-suse.patch b/shadow-login_defs-suse.patch index cb090cb..8893bc0 100644 --- a/shadow-login_defs-suse.patch +++ b/shadow-login_defs-suse.patch @@ -14,7 +14,17 @@ Index: etc/login.defs # # Delay in seconds before being allowed another attempt after a login failure -@@ -53,8 +56,8 @@ MOTD_FILE /etc/motd +@@ -38,8 +41,7 @@ CONSOLE /etc/securetty + # If defined, ":" delimited list of "message of the day" files to + # be displayed upon login. + # +-MOTD_FILE /etc/motd +-#MOTD_FILE /etc/motd:/usr/lib/news/news-motd ++#MOTD_FILE /etc/motd:/usr/share/misc/motd + + # + # If defined, file which maps tty line to TERM environment parameter. +@@ -53,8 +55,8 @@ MOTD_FILE /etc/motd # user's name or shell are found in the file. If not a full pathname, then # hushed mode will be enabled if the file exists in the user's home directory. # @@ -25,7 +35,7 @@ Index: etc/login.defs # If this variable is set to "yes", hostname will be suppressed in the # login: prompt. -@@ -73,9 +76,9 @@ HUSHLOGIN_FILE .hushlogin +@@ -73,9 +75,9 @@ HUSHLOGIN_FILE .hushlogin # ENV_SUPATH is an ENV_ROOTPATH override for su and runuser # (and falback for login). # @@ -38,7 +48,7 @@ Index: etc/login.defs # If this variable is set to "yes" (default is "no"), su will always set # path. every su call will overwrite the PATH variable. -@@ -99,7 +102,7 @@ ALWAYS_SET_PATH no +@@ -99,7 +101,7 @@ ALWAYS_SET_PATH no # set TTYPERM to either 622 or 600. # TTYGROUP tty @@ -47,7 +57,7 @@ Index: etc/login.defs # Default initial "umask" value used by login(1) on non-PAM enabled systems. # Default "umask" value for pam_umask(8) on PAM enabled systems. -@@ -132,8 +135,8 @@ PASS_WARN_AGE 7 +@@ -132,8 +134,8 @@ PASS_WARN_AGE 7 UID_MIN 1000 UID_MAX 60000 # System accounts @@ -58,7 +68,7 @@ Index: etc/login.defs # Extra per user uids SUB_UID_MIN 100000 SUB_UID_MAX 600100000 -@@ -150,8 +153,8 @@ SUB_UID_COUNT 65536 +@@ -150,8 +152,8 @@ SUB_UID_COUNT 65536 GID_MIN 1000 GID_MAX 60000 # System accounts @@ -69,7 +79,7 @@ Index: etc/login.defs # Extra per user group ids SUB_GID_MIN 100000 SUB_GID_MAX 600100000 -@@ -160,7 +163,7 @@ SUB_GID_COUNT 65536 +@@ -160,7 +162,7 @@ SUB_GID_COUNT 65536 # # Max number of login(1) retries if password is bad # @@ -78,7 +88,7 @@ Index: etc/login.defs # # Max time in seconds for login(1) -@@ -176,18 +179,9 @@ LOGIN_TIMEOUT 60 +@@ -176,18 +178,9 @@ LOGIN_TIMEOUT 60 CHFN_RESTRICT rwh # @@ -99,7 +109,7 @@ Index: etc/login.defs # # If set to MD5, MD5-based algorithm will be used for encrypting password -@@ -201,8 +195,8 @@ CHFN_RESTRICT rwh +@@ -201,8 +194,8 @@ CHFN_RESTRICT rwh # Note: If you use PAM, it is recommended to use a value consistent with # the PAM modules configuration. # @@ -110,7 +120,7 @@ Index: etc/login.defs # # Number of rounds for salt. -@@ -271,7 +265,7 @@ USERDEL_POSTCMD /usr/sbin/userde +@@ -271,7 +264,7 @@ USERDEL_POSTCMD /usr/sbin/userde # # This also enables userdel(8) to remove user groups if no members exist. # @@ -119,7 +129,7 @@ Index: etc/login.defs # # If set to a non-zero number, the shadow utilities will make sure that -@@ -290,13 +284,13 @@ USERGROUPS_ENAB yes +@@ -290,13 +283,13 @@ USERGROUPS_ENAB yes # This option is overridden with the -M or -m flags on the useradd(8) # command-line. # diff --git a/shadow.changes b/shadow.changes index f6d2567..a374ef1 100644 --- a/shadow.changes +++ b/shadow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 2 09:45:48 UTC 2019 - lnussel@suse.de + +- don't specify MOTD_FILE in login.defs but fall back to built in + defaults of login (boo#1133929) + ------------------------------------------------------------------- Tue Apr 30 22:27:14 CEST 2019 - sbrabec@suse.com