From 68744514da3b73ba066c1433ef739c2ecd14f8c9 Mon Sep 17 00:00:00 2001
From: beta <beta@yfqm.date>
Date: Wed, 11 Dec 2024 12:03:34 +0800
Subject: [PATCH] chpasswd fix coredump with s parameter

Signed-off-by: beta <beta@yfqm.date>
(cherry picked from commit 5b1f05d7e496df3125e0faab1b6ec2db73d167f0)
---
 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 288e761..41b23a5 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -1,6 +1,6 @@
 Name: shadow
 Version: 4.14.3
-Release: 5
+Release: 6
 Epoch: 2
 License: BSD and GPLv2+
 Summary: Tools for managing accounts and shadow password files
@@ -198,6 +198,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.{la,a}
 %{_mandir}/*/*
 
 %changelog
+* Wed Feb 12 2025 beta <beta@yfqm.date> - 2:4.14.3-6
+- chpasswd fix coredump with s parameter
+
 * Fri Feb 7 2025 hugel <gengqihu2@h-partners.com> - 2:4.14.3-5
 - backport patches from upstream
 
-- 
Gitee