From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 7 May 2020 09:19:39 +0000 (+0300)
Subject: pop3-proxy: Add [SYS/TEMP] prefix to temporary login failures
X-Git-Tag: 2.3.13~661
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29e0ae6d4a968b24a638d1f7e87ffe0a43372ef5;p=thirdparty%2Fdovecot%2Fcore.git

pop3-proxy: Add [SYS/TEMP] prefix to temporary login failures
---

diff --git a/src/pop3-login/pop3-proxy.c b/src/pop3-login/pop3-proxy.c
index e165b33c43..04ee265d18 100644
--- a/src/pop3-login/pop3-proxy.c
+++ b/src/pop3-login/pop3-proxy.c
@@ -283,14 +283,18 @@ pop3_proxy_send_failure_reply(struct client *client,
 	switch (type) {
 	case LOGIN_PROXY_FAILURE_TYPE_CONNECT:
 	case LOGIN_PROXY_FAILURE_TYPE_INTERNAL:
-	case LOGIN_PROXY_FAILURE_TYPE_INTERNAL_CONFIG:
 	case LOGIN_PROXY_FAILURE_TYPE_REMOTE:
-	case LOGIN_PROXY_FAILURE_TYPE_REMOTE_CONFIG:
 	case LOGIN_PROXY_FAILURE_TYPE_PROTOCOL:
+		client_send_reply(client, POP3_CMD_REPLY_TEMPFAIL,
+				  LOGIN_PROXY_FAILURE_MSG);
+		break;
+	case LOGIN_PROXY_FAILURE_TYPE_INTERNAL_CONFIG:
+	case LOGIN_PROXY_FAILURE_TYPE_REMOTE_CONFIG:
 		client_send_reply(client, POP3_CMD_REPLY_ERROR,
 				  LOGIN_PROXY_FAILURE_MSG);
 		break;
 	case LOGIN_PROXY_FAILURE_TYPE_AUTH_TEMPFAIL:
+		/* [SYS/TEMP] prefix is already in the reason string */
 		client_send_reply(client, POP3_CMD_REPLY_ERROR, reason);
 		break;
 	case LOGIN_PROXY_FAILURE_TYPE_AUTH: