diff --git a/shadow.spec b/shadow.spec index 29e4b20..dc5615b 100644 --- a/shadow.spec +++ b/shadow.spec @@ -1,6 +1,6 @@ Name: shadow Version: 4.7 -Release: 4 +Release: 5 Epoch: 2 License: BSD and GPLv2+ Summary: Tools for managing accounts and shadow password files @@ -11,6 +11,8 @@ Source2: shadow-utils.useradd Source3: shadow-utils.login.defs Source4: shadow-bsd.txt Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt +# fix unknown item 'LASTLOG_MAX_UID' +Patch1: usermod.c-Fix-invalid-variable-name.patch Patch9000: shadow-4.1.5.1-var-lock.patch Patch9001: shadow-utils-fix-lock-file-residue.patch Patch9002: shadow-utils-fix-invalid-path.patch @@ -162,6 +164,9 @@ done %{_mandir}/*/* %changelog +* Thu Jan 16 2020 openEuler Buildteam - 2:4.7-5 +- Fix unknown item 'LASTLOG_MAX_UID' + * Sun Jan 12 2020 openEuler Buildteam - 2:4.7-4 - Delete unused patch diff --git a/usermod.c-Fix-invalid-variable-name.patch b/usermod.c-Fix-invalid-variable-name.patch new file mode 100644 index 0000000..7938965 --- /dev/null +++ b/usermod.c-Fix-invalid-variable-name.patch @@ -0,0 +1,28 @@ +From fc0ed79e5d700b4a730235fe88e60951717edc6e Mon Sep 17 00:00:00 2001 +From: Stanislav Brabec +Date: Fri, 26 Jul 2019 21:39:42 +0200 +Subject: [PATCH] usermod.c: Fix invalid variable name + +Fix invalid LASTLOG_MAX_UID variable name to correct LASTLOG_UID_MAX. + +Signed-off-by: Stanislav Brabec +--- + src/usermod.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/usermod.c b/src/usermod.c +index c371886..0ae50e3 100644 +--- a/src/usermod.c ++++ b/src/usermod.c +@@ -1879,7 +1879,7 @@ static void update_lastlog (void) + return; + } + +- max_uid = (uid_t) getdef_ulong ("LASTLOG_MAX_UID", 0xFFFFFFFFUL); ++ max_uid = (uid_t) getdef_ulong ("LASTLOG_UID_MAX", 0xFFFFFFFFUL); + if (user_newid > max_uid) { + /* do not touch lastlog for large uids */ + return; +-- +1.8.3.1 +