From 26a604f8e2222db06094ffe1044361ae61e47687 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 11 Jan 2024 12:02:23 -0500 Subject: [PATCH] auth: Log the same "user not found" error regardless of how many userdbs exist If a passdb lookup succeeded, but userdb lookup fails with "user not found", an error is logged. This error used to include the userdb prefix when there was only a single userdb configured. However, this is just unnecessary extra complexity and with one userdb it's not very useful anyway. --- src/auth/auth-request.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c index fe84eb99ee..4a0032154a 100644 --- a/src/auth/auth-request.c +++ b/src/auth/auth-request.c @@ -1606,14 +1606,7 @@ void auth_request_userdb_callback(enum userdb_result result, } else if (request->client_pid != 0) { /* this was an actual login attempt, the user should have been found. */ - if (auth_request_get_auth(request)->userdbs->next == NULL) { - e_error(request->event, - "%suser not found from userdb", - auth_request_get_log_prefix_db(request)); - } else { - e_error(request->event, - "user not found from any userdbs"); - } + e_error(request->event, "user not found from any userdbs"); result = USERDB_RESULT_USER_UNKNOWN; } else { result = USERDB_RESULT_USER_UNKNOWN; -- 2.47.3