From 80959e30ce7c57b5865f5358c42a7bcffe450d4d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 20 May 2024 17:22:36 +0200 Subject: Merging upstream version 2.9.5. Signed-off-by: Daniel Baumann --- src/responder/common/cache_req/plugins/cache_req_common.c | 5 ++++- src/responder/common/cache_req/plugins/cache_req_group_by_filter.c | 2 +- src/responder/common/cache_req/plugins/cache_req_user_by_filter.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/responder/common/cache_req/plugins') diff --git a/src/responder/common/cache_req/plugins/cache_req_common.c b/src/responder/common/cache_req/plugins/cache_req_common.c index 7eb0921..00b9383 100644 --- a/src/responder/common/cache_req/plugins/cache_req_common.c +++ b/src/responder/common/cache_req/plugins/cache_req_common.c @@ -129,7 +129,10 @@ cache_req_common_process_dp_reply(struct cache_req *cr, bool bret; if (ret != EOK) { - CACHE_REQ_DEBUG(SSSDBG_IMPORTANT_INFO, cr, + int msg_level = SSSDBG_IMPORTANT_INFO; + /* ERR_DOMAIN_NOT_FOUND: 'ad_enabled_domains' option can exclude domain */ + if (ret == ERR_DOMAIN_NOT_FOUND) msg_level = SSSDBG_CONF_SETTINGS; + CACHE_REQ_DEBUG(msg_level, cr, "Could not get account info [%d]: %s\n", ret, sss_strerror(ret)); CACHE_REQ_DEBUG(SSSDBG_TRACE_FUNC, cr, diff --git a/src/responder/common/cache_req/plugins/cache_req_group_by_filter.c b/src/responder/common/cache_req/plugins/cache_req_group_by_filter.c index 1292f18..2f35107 100644 --- a/src/responder/common/cache_req/plugins/cache_req_group_by_filter.c +++ b/src/responder/common/cache_req/plugins/cache_req_group_by_filter.c @@ -94,7 +94,7 @@ cache_req_group_by_filter_lookup(TALLOC_CTX *mem_ctx, if (is_files_provider(domain)) { recent_filter = NULL; } else { - recent_filter = talloc_asprintf(mem_ctx, "(%s>=%lu)", SYSDB_LAST_UPDATE, + recent_filter = talloc_asprintf(mem_ctx, "(%s>=%"SPRItime")", SYSDB_LAST_UPDATE, cr->req_start); if (recent_filter == NULL) { return ENOMEM; diff --git a/src/responder/common/cache_req/plugins/cache_req_user_by_filter.c b/src/responder/common/cache_req/plugins/cache_req_user_by_filter.c index 11ea9ec..831b783 100644 --- a/src/responder/common/cache_req/plugins/cache_req_user_by_filter.c +++ b/src/responder/common/cache_req/plugins/cache_req_user_by_filter.c @@ -97,7 +97,7 @@ cache_req_user_by_filter_lookup(TALLOC_CTX *mem_ctx, if (is_files_provider(domain) || data->name.attr != NULL) { recent_filter = NULL; } else { - recent_filter = talloc_asprintf(mem_ctx, "(%s>=%lu)", SYSDB_LAST_UPDATE, + recent_filter = talloc_asprintf(mem_ctx, "(%s>=%"SPRItime")", SYSDB_LAST_UPDATE, cr->req_start); if (recent_filter == NULL) { return ENOMEM; -- cgit v1.2.3