diff --git a/backport-TOOLS-mistype-fix.patch b/backport-TOOLS-mistype-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..75e5eaf8074605df44193c9679b2e30bde250c96 --- /dev/null +++ b/backport-TOOLS-mistype-fix.patch @@ -0,0 +1,30 @@ +From 3621a587a32589e8404ed1f2356fcbfebc128efc Mon Sep 17 00:00:00 2001 +From: Alexey Tikhonov +Date: Mon, 2 Sep 2024 21:04:34 +0200 +Subject: [PATCH] TOOLS: mistype fix +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reviewed-by: Iker Pedrosa +Reviewed-by: Tomáš Halman +--- + src/tools/sssctl/sssctl_data.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/sssctl/sssctl_data.c b/src/tools/sssctl/sssctl_data.c +index 79e12078e..43b9814ea 100644 +--- a/src/tools/sssctl/sssctl_data.c ++++ b/src/tools/sssctl/sssctl_data.c +@@ -166,7 +166,7 @@ static errno_t sssctl_restore(bool force_start, bool force_restart) + } + } + +- if (sssctl_backup_file_exists(SSS_BACKUP_USER_OVERRIDES)) { ++ if (sssctl_backup_file_exists(SSS_BACKUP_GROUP_OVERRIDES)) { + ret = sssctl_run_command((const char *[]){"sss_override", "group-import", + SSS_BACKUP_GROUP_OVERRIDES, NULL}); + if (ret != EOK) { +-- +2.33.0 + diff --git a/sssd.spec b/sssd.spec index 945391468e6419785bab045d3eff038f0c447570..9ed3754743607644ef18d90c3b5922674093667d 100644 --- a/sssd.spec +++ b/sssd.spec @@ -1,6 +1,6 @@ Name: sssd Version: 2.2.2 -Release: 18 +Release: 19 Summary: System Security Services Daemon License: GPLv3+ and LGPLv3+ URL: https://pagure.io/SSSD/sssd/ @@ -20,6 +20,7 @@ Patch10: backport-CVE-2023-3758.patch Patch11: backport-avoid-NULL-deref-in-monitor_service_shutdow.patch Patch12: backport-UTILS-inotify-avoid-potential-NULL-deref.patch Patch13: backport-RESPONDER-use-proper-context-for-getDomains.patch +Patch14: backport-TOOLS-mistype-fix.patch Requires: python3-sssd = %{version}-%{release} Requires: libldb @@ -593,6 +594,9 @@ fi %{_libdir}/%{name}/modules/libwbclient.so %changelog +* Tue Dec 03 2024 wangjiang - 2.2.2-19 +- backport upstream patches + * Tue Jun 18 2024 wangjiang - 2.2.2-18 - backport upstream patches