From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 27 Dec 2017 14:18:14 +0000 (+0100)
Subject: submission: BURL command: Return more appropriate 554 5.7.14 error when BURL/URLAUTH... 
X-Git-Tag: 2.3.9~2593
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00cdcc993df1a468b6b16d2e580cb394a022c244;p=thirdparty%2Fdovecot%2Fcore.git

submission: BURL command: Return more appropriate 554 5.7.14 error when BURL/URLAUTH is not configured.

Defined in RFC5248, Section 2.4.
---

diff --git a/src/submission/cmd-data.c b/src/submission/cmd-data.c
index 1cb5e49b40..78294077af 100644
--- a/src/submission/cmd-data.c
+++ b/src/submission/cmd-data.c
@@ -268,7 +268,16 @@ cmd_burl_fetch(struct cmd_burl_context *burl_cmd, const char *url,
 	struct client *client = burl_cmd->client;
 
 	if (client->urlauth_ctx == NULL) {
-		smtp_server_reply(cmd, 503, "5.3.3",
+		/* RFC5248, Section 2.4:
+
+		   554 5.7.14 Trust relationship required
+
+		   The submission server requires a configured trust
+		   relationship with a third-party server in order to access
+		   the message content. This value replaces the prior use of
+		   X.7.8 for this error condition, thereby updating [RFC4468].
+		 */
+		smtp_server_reply(cmd, 554, "5.7.14",
 			"No IMAP URLAUTH access available");
 		return -1;
 	}