From e04123e7d99aff1a8db244f07172d106a1438c9c Mon Sep 17 00:00:00 2001
From: beta <beta@yfqm.date>
Date: Wed, 11 Sep 2024 11:15:30 +0800
Subject: [PATCH] chpasswd fix coredump with s parameter

Signed-off-by: beta <beta@yfqm.date>
---
 shadow-add-sm3-crypt-support.patch | 4 ++--
 shadow.spec                        | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/shadow-add-sm3-crypt-support.patch b/shadow-add-sm3-crypt-support.patch
index 8b1e98a..b5ee39e 100644
--- a/shadow-add-sm3-crypt-support.patch
+++ b/shadow-add-sm3-crypt-support.patch
@@ -496,8 +496,8 @@ index 1a1a5d5..a2b6e9e 100644
  #endif				/* USE_YESCRYPT */
 -                        if (bad_s != 0) {
 +#if defined(USE_SM3_CRYPT)
-+                        if ((   (0 == strcmp (crypt_method, "SM3"))
-+			       && (0 == getlong(optarg, &sm3_rounds)))) {
++                        if (IS_CRYPT_METHOD("SM3")
++			       && (0 == getlong(optarg, &sm3_rounds))) {
 +                            bad_s = 1;
 +                        }
 +#endif				/* USE_SM3_CRYPT */
diff --git a/shadow.spec b/shadow.spec
index daee21a..1ca7383 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -1,6 +1,6 @@
 Name: shadow
 Version: 4.14.3
-Release: 2
+Release: 3
 Epoch: 2
 License: BSD and GPLv2+
 Summary: Tools for managing accounts and shadow password files
@@ -192,6 +192,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.{la,a}
 %{_mandir}/*/*
 
 %changelog
+* Wed Sep 11 2024 beta <beta@yfqm.date> - 2:4.14.3-3
+- chpasswd fix coredump with s parameter
+
 * Mon Jul 15 2024 wangziliang <wangziliang@kylinos.cn> - 2:4.14.3-2
 - backport patches from upstream
 
-- 
Gitee