!171 backport patches from upstream community

From: @fwo 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2024-12-03 07:20:56 +00:00 committed by Gitee
commit 56658fd288
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 3621a587a32589e8404ed1f2356fcbfebc128efc Mon Sep 17 00:00:00 2001
From: Alexey Tikhonov <atikhono@redhat.com>
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 <ipedrosa@redhat.com>
Reviewed-by: Tomáš Halman <thalman@redhat.com>
---
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

View File

@ -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 <app@cameyan.com> - 2.2.2-19
- backport upstream patches
* Tue Jun 18 2024 wangjiang <wangjiang37@h-partners.com> - 2.2.2-18
- backport upstream patches