From: Markus Valentin <markus.valentin@open-xchange.com>
Date: Thu, 16 Feb 2023 15:33:17 +0000 (+0100)
Subject: login-common: Remove no_extra_disconnect_reason
X-Git-Tag: 2.4.0~2892
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77674ad334a3fddacb354ecff7e84cae36765d5f;p=thirdparty%2Fdovecot%2Fcore.git

login-common: Remove no_extra_disconnect_reason

This got obsolete by previous changes and prevented properly set reason
for the login_aborted event on some internal failures.
---

diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index 8a99454988..3e159848ab 100644
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -982,7 +982,6 @@ sasl_callback(struct client *client, enum sasl_server_reply sasl_reply,
 			data = t_strdup_printf("Internal login failure (pid=%s id=%u)",
 					       my_pid, client->master_auth_id);
 		}
-		client->no_extra_disconnect_reason = TRUE;
 		client_destroy(client, data);
 		break;
 	case SASL_SERVER_REPLY_CONTINUE:
diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index abbf5548a7..03a5ad207a 100644
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -329,8 +329,7 @@ static void login_aborted_event(struct client *client, const char *reason,
 	const char *human_reason, *event_reason;
 
 	i_assert(reason != NULL);
-	if (!client->no_extra_disconnect_reason &&
-	    client_get_extra_disconnect_reason(client, &human_reason, &event_reason))
+	if (client_get_extra_disconnect_reason(client, &human_reason, &event_reason))
 		reason = t_strdup_printf("%s (%s)", reason, human_reason);
 	else
 		event_reason = reason;
diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h
index 23eea93d9d..48db31cc5d 100644
--- a/src/login-common/client-common.h
+++ b/src/login-common/client-common.h
@@ -237,7 +237,6 @@ struct client {
 	bool destroyed:1;
 	bool input_blocked:1;
 	bool login_success:1;
-	bool no_extra_disconnect_reason:1;
 	/* Client/proxy connection is using TLS. Either Dovecot or HAProxy
 	   has terminated the TLS connection. */
 	bool connection_tls_secured:1;