|
 |
5ddef6 |
From 352544558cef26c9ef4a7393cbf98776155efcdb Mon Sep 17 00:00:00 2001
|
|
|
5ddef6 |
From: Alexey Tikhonov <atikhono@redhat.com>
|
|
|
5ddef6 |
Date: Tue, 19 Jul 2022 12:50:35 +0200
|
|
|
5ddef6 |
Subject: [PATCH] IFP: reset idle timer on any DBUS activity
|
|
|
5ddef6 |
MIME-Version: 1.0
|
|
|
5ddef6 |
Content-Type: text/plain; charset=UTF-8
|
|
|
5ddef6 |
Content-Transfer-Encoding: 8bit
|
|
|
5ddef6 |
|
|
|
5ddef6 |
Resolves: https://github.com/SSSD/sssd/issues/6269
|
|
|
5ddef6 |
|
|
|
5ddef6 |
Reviewed-by: Alejandro Lopez <allopez@redhat.com>
|
|
|
5ddef6 |
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
|
5ddef6 |
---
|
|
|
5ddef6 |
src/responder/ifp/ifpsrv.c | 9 +++++----
|
|
|
5ddef6 |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
5ddef6 |
|
|
|
5ddef6 |
diff --git a/src/responder/ifp/ifpsrv.c b/src/responder/ifp/ifpsrv.c
|
|
|
5ddef6 |
index 2bd4e3703..97034d9d0 100644
|
|
|
5ddef6 |
--- a/src/responder/ifp/ifpsrv.c
|
|
|
5ddef6 |
+++ b/src/responder/ifp/ifpsrv.c
|
|
|
5ddef6 |
@@ -94,7 +94,7 @@ static errno_t
|
|
|
5ddef6 |
sysbus_init(TALLOC_CTX *mem_ctx,
|
|
|
5ddef6 |
struct tevent_context *ev,
|
|
|
5ddef6 |
const char *dbus_name,
|
|
|
5ddef6 |
- void *pvt,
|
|
|
5ddef6 |
+ struct ifp_ctx *ifp_ctx,
|
|
|
5ddef6 |
struct sysbus_ctx **sysbus)
|
|
|
5ddef6 |
{
|
|
|
5ddef6 |
DBusError dbus_error;
|
|
|
5ddef6 |
@@ -138,20 +138,21 @@ sysbus_init(TALLOC_CTX *mem_ctx,
|
|
|
5ddef6 |
/* Integrate with tevent loop */
|
|
|
5ddef6 |
ret = sbus_init_connection(system_bus, ev, conn,
|
|
|
5ddef6 |
SBUS_CONN_TYPE_SYSBUS,
|
|
|
5ddef6 |
- NULL, NULL, &system_bus->conn);
|
|
|
5ddef6 |
+ &ifp_ctx->rctx->last_request_time,
|
|
|
5ddef6 |
+ NULL, &system_bus->conn);
|
|
|
5ddef6 |
if (ret != EOK) {
|
|
|
5ddef6 |
DEBUG(SSSDBG_CRIT_FAILURE,
|
|
|
5ddef6 |
"Could not integrate D-BUS into mainloop.\n");
|
|
|
5ddef6 |
goto fail;
|
|
|
5ddef6 |
}
|
|
|
5ddef6 |
|
|
|
5ddef6 |
- ret = ifp_register_sbus_interface(system_bus->conn, pvt);
|
|
|
5ddef6 |
+ ret = ifp_register_sbus_interface(system_bus->conn, ifp_ctx);
|
|
|
5ddef6 |
if (ret != EOK) {
|
|
|
5ddef6 |
DEBUG(SSSDBG_CRIT_FAILURE, "Could not register interfaces\n");
|
|
|
5ddef6 |
goto fail;
|
|
|
5ddef6 |
}
|
|
|
5ddef6 |
|
|
|
5ddef6 |
- ifp_register_nodes(pvt, system_bus->conn);
|
|
|
5ddef6 |
+ ifp_register_nodes(ifp_ctx, system_bus->conn);
|
|
|
5ddef6 |
|
|
|
5ddef6 |
*sysbus = system_bus;
|
|
|
5ddef6 |
return EOK;
|
|
|
5ddef6 |
--
|
|
|
5ddef6 |
2.37.3
|
|
|
5ddef6 |
|