From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 29 Apr 2020 10:40:17 +0000 (+0300)
Subject: login-proxy: Handle auth failures with login_proxy_failed()
X-Git-Tag: 2.3.13~677
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a32a10cf66b0b0755f4c9dcc4ed58d80451ba048;p=thirdparty%2Fdovecot%2Fcore.git

login-proxy: Handle auth failures with login_proxy_failed()
---

diff --git a/src/imap-login/imap-proxy.c b/src/imap-login/imap-proxy.c
index 35bebec5b0..bf13ec9076 100644
--- a/src/imap-login/imap-proxy.c
+++ b/src/imap-login/imap-proxy.c
@@ -383,8 +383,9 @@ int imap_proxy_parse_line(struct client *client, const char *line)
 					       AUTH_FAILED_MSG);
 		}
 
-		client->proxy_auth_failed = TRUE;
-		client_proxy_failed(client, FALSE);
+		login_proxy_failed(client->login_proxy,
+				   login_proxy_get_event(client->login_proxy),
+				   LOGIN_PROXY_FAILURE_TYPE_AUTH, NULL);
 		return -1;
 	} else if (strncasecmp(line, "* CAPABILITY ", 13) == 0) {
 		i_free(imap_client->proxy_backend_capability);
diff --git a/src/login-common/client-common-auth.c b/src/login-common/client-common-auth.c
index 797e150b4c..1fea855e4b 100644
--- a/src/login-common/client-common-auth.c
+++ b/src/login-common/client-common-auth.c
@@ -397,6 +397,7 @@ static void proxy_failed(struct client *client,
 		client_proxy_failed(client, TRUE);
 		break;
 	case LOGIN_PROXY_FAILURE_TYPE_AUTH:
+		client->proxy_auth_failed = TRUE;
 		client_proxy_failed(client, FALSE);
 		break;
 	}
diff --git a/src/pop3-login/pop3-proxy.c b/src/pop3-login/pop3-proxy.c
index 0c32c9da5f..11bae13e7e 100644
--- a/src/pop3-login/pop3-proxy.c
+++ b/src/pop3-login/pop3-proxy.c
@@ -262,8 +262,9 @@ int pop3_proxy_parse_line(struct client *client, const char *line)
 			line += 5;
 		client_proxy_log_failure(client, line);
 	}
-	client->proxy_auth_failed = TRUE;
-	client_proxy_failed(client, FALSE);
+	login_proxy_failed(client->login_proxy,
+			   login_proxy_get_event(client->login_proxy),
+			   LOGIN_PROXY_FAILURE_TYPE_AUTH, NULL);
 	return -1;
 }
 
diff --git a/src/submission-login/submission-proxy.c b/src/submission-login/submission-proxy.c
index 82d968785b..d1e849991c 100644
--- a/src/submission-login/submission-proxy.c
+++ b/src/submission-login/submission-proxy.c
@@ -437,8 +437,9 @@ int submission_proxy_parse_line(struct client *client, const char *line)
 	if (client->set->auth_verbose) {
 		client_proxy_log_failure(client, text);
 	}
-	client->proxy_auth_failed = TRUE;
-	client_proxy_failed(client, FALSE);
+	login_proxy_failed(client->login_proxy,
+			   login_proxy_get_event(client->login_proxy),
+			   LOGIN_PROXY_FAILURE_TYPE_AUTH, NULL);
 	return -1;
 }