diff --git a/backport-MONITOR-fix-socket_activated-flag-initialization.patch b/backport-MONITOR-fix-socket_activated-flag-initialization.patch new file mode 100644 index 0000000000000000000000000000000000000000..0802acda53a9938cf13aa19c9da09d33e9d8eec1 --- /dev/null +++ b/backport-MONITOR-fix-socket_activated-flag-initialization.patch @@ -0,0 +1,47 @@ +From d4f7ed69dbd3aad3be2c52d2da5f75af6d32e3c0 Mon Sep 17 00:00:00 2001 +From: Alexey Tikhonov +Date: Mon, 13 Feb 2023 17:48:41 +0100 +Subject: [PATCH] MONITOR: fix `socket_activated` flag initialization +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When socket activated service connects for the first time, it is added to +`mt_ctx->svc_list` by `socket_activated_service_not_found()` with a proper +`socket_activated = true`. +But when it reconnects again, `get_service_in_the_list()` finds it in +`mt_ctx->svc_list` and overwrites `socket_activated = false` unconditionally. +This patch moves `socket_activated = false` to `start_service()`. + +Resolves: https://github.com/SSSD/sssd/issues/6324 + +Reviewed-by: Iker Pedrosa +Reviewed-by: Pavel Březina +--- + src/monitor/monitor.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c +index 6d3d05cd3..0972465f9 100644 +--- a/src/monitor/monitor.c ++++ b/src/monitor/monitor.c +@@ -242,7 +242,6 @@ get_service_in_the_list(struct mt_ctx *mt_ctx, + + for (svc = mt_ctx->svc_list; svc != NULL; svc = svc->next) { + if (strcasecmp(svc->identity, svc_name) == 0) { +- svc->socket_activated = false; + *_svc = svc; + return EOK; + } +@@ -1802,6 +1801,8 @@ static int start_service(struct mt_svc *svc) + + DEBUG(SSSDBG_CONF_SETTINGS,"Queueing service %s for startup\n", svc->name); + ++ svc->socket_activated = false; ++ + tv = tevent_timeval_current(); + + /* Add a timed event to start up the service. +-- +2.27.0 + diff --git a/sssd.spec b/sssd.spec index 6e986b9a47984444a30a48bfd6ed500d21ae3c1c..b457ad6d8752aef4e4dbda577baed9adf76104cc 100644 --- a/sssd.spec +++ b/sssd.spec @@ -1,6 +1,6 @@ Name: sssd Version: 2.6.1 -Release: 8 +Release: 9 Summary: System Security Services Daemon License: GPLv3+ and LGPLv3+ URL: https://pagure.io/SSSD/sssd/ @@ -13,6 +13,7 @@ Patch6003: sssctl-free-one-malloc-allocated-variable.patch Patch6004: PAM-P11-fixed-minor-mem-leak.patch Patch6005: SSS_CLIENT-mem-cache-fixed-missing-error-code.patch Patch6006: fix-coredump-during-ifp-reconnect.patch +Patch6007: backport-MONITOR-fix-socket_activated-flag-initialization.patch Requires: python3-sssd = %{version}-%{release} Requires: libldb @@ -520,6 +521,9 @@ fi %systemd_postun_with_restart sssd.service %changelog +* Thu Mar 23 2023 yixiangzhike - 2.6.1-9 +- backport upstream patch + * Sat Dec 24 2022 huangzq6 -2.6.1-8 - fix coredump during ifp reconnect