From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 9 Apr 2020 21:22:39 +0000 (+0300)
Subject: login-common: client_disconnect() - Log with login_proxy event if it exists
X-Git-Tag: 2.3.11.2~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e190fff805f8e18b96e13e186fa7a69495dcf00;p=thirdparty%2Fdovecot%2Fcore.git

login-common: client_disconnect() - Log with login_proxy event if it exists
---

diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index 67af7e57cb..20b658b91b 100644
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -262,8 +262,7 @@ void client_proxy_finish_destroy_client(struct client *client)
 		return;
 	}
 
-	str_printfa(str, "proxy(%s): started proxying to %s:%u",
-		    client->virtual_user,
+	str_printfa(str, "started proxying to %s:%u",
 		    login_proxy_get_host(client->login_proxy),
 		    login_proxy_get_port(client->login_proxy));
 	if (strcmp(client->virtual_user, client->proxy_user) != 0) {
diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index d96dba8256..807fe27249 100644
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -265,8 +265,12 @@ void client_disconnect(struct client *client, const char *reason)
 		if (extra_reason[0] != '\0')
 			reason = t_strconcat(reason, " ", extra_reason, NULL);
 	}
-	if (reason != NULL)
-		e_info(client->event, "%s", reason);
+	if (reason != NULL) {
+		struct event *event = client->login_proxy == NULL ?
+			client->event :
+			login_proxy_get_event(client->login_proxy);
+		e_info(event, "%s", reason);
+	}
 
 	if (client->output != NULL)
 		o_stream_uncork(client->output);