From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 9 Aug 2024 06:43:06 +0000 (+0300)
Subject: login-common: Add the event reason code to "Login aborted" log lines
X-Git-Tag: 2.4.0~1500
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=616d89bad80b40f643222f28786adca1065121a0;p=thirdparty%2Fdovecot%2Fcore.git

login-common: Add the event reason code to "Login aborted" log lines

This makes it easier to search the logs for the wanted errors.
---

diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index 0bf436af15..b7db6a0f7c 100644
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -361,10 +361,8 @@ static void login_aborted_event(struct client *client, const char *reason)
 	i_assert(reason != NULL);
 	if (client_get_extra_disconnect_reason(client, &human_reason, &event_reason))
 		reason = t_strdup_printf("%s (%s)", reason, human_reason);
-	else
-		event_reason = reason;
 
-	e->add_str("reason", event_reason);
+	e->add_str("reason", event_reason != NULL ? event_reason : reason);
 	e->add_int("auth_successes", client->auth_successes);
 	e->add_int("auth_attempts", client->auth_attempts);
 	e->add_int("auth_usecs", timeval_diff_usecs(&ioloop_timeval,
@@ -372,7 +370,12 @@ static void login_aborted_event(struct client *client, const char *reason)
 	e->add_int("connected_usecs", timeval_diff_usecs(&ioloop_timeval,
 							 &client->created));
 
-	e_info(e->event(), "Login aborted: %s", reason);
+	if (event_reason == NULL)
+		e_info(e->event(), "Login aborted: %s", reason);
+	else {
+		e_info(e->event(), "Login aborted: %s (%s)",
+		       reason, event_reason);
+	}
 }
 
 void client_disconnect(struct client *client, const char *reason)