From 5d14aabf1d1d96dd8f6ec594ee65863ddbfc087a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 20 May 2024 17:22:35 +0200 Subject: Merging upstream version 2.9.5. Signed-off-by: Daniel Baumann --- src/sbus/codegen/templates/client_async.c.tpl | 2 +- src/sbus/router/sbus_router_handler.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/sbus') diff --git a/src/sbus/codegen/templates/client_async.c.tpl b/src/sbus/codegen/templates/client_async.c.tpl index e16ce42..ae15484 100644 --- a/src/sbus/codegen/templates/client_async.c.tpl +++ b/src/sbus/codegen/templates/client_async.c.tpl @@ -405,7 +405,7 @@ TEVENT_REQ_RETURN_ON_ERROR(req); - *_value = talloc_steal(mem_ctx, state->out->arg0);state->out->arg0; + *_value = talloc_steal(mem_ctx, state->out->arg0)state->out->arg0; return EOK; } diff --git a/src/sbus/router/sbus_router_handler.c b/src/sbus/router/sbus_router_handler.c index 7b6c244..db8fbbf 100644 --- a/src/sbus/router/sbus_router_handler.c +++ b/src/sbus/router/sbus_router_handler.c @@ -150,6 +150,9 @@ static void sbus_issue_request_done(struct tevent_req *subreq) } else { int msg_level = SSSDBG_OP_FAILURE; if (ret == ERR_MISSING_DP_TARGET) msg_level = SSSDBG_FUNC_DATA; + if (ret == EACCES) msg_level = SSSDBG_MINOR_FAILURE; /* IFP ACL */ + /* ERR_DOMAIN_NOT_FOUND: 'ad_enabled_domains' option can exclude domain */ + if (ret == ERR_DOMAIN_NOT_FOUND) msg_level = SSSDBG_CONF_SETTINGS; DEBUG(msg_level, "%s.%s: Error [%d]: %s\n", meta.interface, meta.member, ret, sss_strerror(ret)); } -- cgit v1.2.3