From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sun, 3 May 2020 19:28:15 +0000 (+0300)
Subject: login-proxy: client_proxy_failed() - Move line sending to caller
X-Git-Tag: 2.3.13~666
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6887ccf32685e4632c06166c5190c7fdab54866;p=thirdparty%2Fdovecot%2Fcore.git

login-proxy: client_proxy_failed() - Move line sending to caller
---

diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index c85ad8089c..57e2f082bc 100644
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -309,11 +309,8 @@ void client_proxy_log_failure(struct client *client, const char *line)
 	e_info(login_proxy_get_event(client->login_proxy), "%s", str_c(str));
 }
 
-static void client_proxy_failed(struct client *client, bool send_line)
+static void client_proxy_failed(struct client *client)
 {
-	if (send_line)
-		client_proxy_error(client, PROXY_FAILURE_MSG);
-
 	login_proxy_free(&client->login_proxy);
 	proxy_free_password(client);
 	i_free_and_null(client->proxy_user);
@@ -383,13 +380,13 @@ static void proxy_failed(struct client *client,
 	case LOGIN_PROXY_FAILURE_TYPE_REMOTE:
 	case LOGIN_PROXY_FAILURE_TYPE_REMOTE_CONFIG:
 	case LOGIN_PROXY_FAILURE_TYPE_PROTOCOL:
-		client_proxy_failed(client, TRUE);
+		client_proxy_error(client, PROXY_FAILURE_MSG);
 		break;
 	case LOGIN_PROXY_FAILURE_TYPE_AUTH:
 		client->proxy_auth_failed = TRUE;
-		client_proxy_failed(client, FALSE);
 		break;
 	}
+	client_proxy_failed(client);
 }
 
 static bool