From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Mon, 29 Oct 2018 16:27:17 +0000 (+0100)
Subject: submission,submission-login: Implicitly enable CHUNKING when submission_backend_capab... 
X-Git-Tag: 2.3.9~1137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daca99f554f1caa8c4b2b84f80e3296696e1917a;p=thirdparty%2Fdovecot%2Fcore.git

submission,submission-login: Implicitly enable CHUNKING when submission_backend_capabilities setting includes BINARYMIME.

BINARYMIME requires CHUNKING support and we should not expect administrators to
always be aware of that fact.
---

diff --git a/src/submission-login/client.c b/src/submission-login/client.c
index 3ab4f6931d..11e8429307 100644
--- a/src/submission-login/client.c
+++ b/src/submission-login/client.c
@@ -50,6 +50,13 @@ client_parse_backend_capabilities(struct submission_client *subm_client )
 
 		subm_client->backend_capabilities |= cap;
 	}
+
+	/* Make sure CHUNKING support is always enabled when BINARYMIME is
+	   enabled by explicit configuration. */
+	if (HAS_ALL_BITS(subm_client->backend_capabilities,
+			 SMTP_CAPABILITY_BINARYMIME)) {
+		subm_client->backend_capabilities |= SMTP_CAPABILITY_CHUNKING;
+	}
 }
 
 static int submission_login_start_tls(void *conn_ctx,
diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c
index 46160dfe08..1625fd37b9 100644
--- a/src/submission/submission-client.c
+++ b/src/submission/submission-client.c
@@ -96,6 +96,13 @@ static void client_parse_backend_capabilities(struct client *client)
 		client->backend_capabilities |= cap;
 	}
 
+	/* Make sure CHUNKING support is always enabled when BINARYMIME is
+	   enabled by explicit configuration. */
+	if (HAS_ALL_BITS(client->backend_capabilities,
+			 SMTP_CAPABILITY_BINARYMIME)) {
+		client->backend_capabilities |= SMTP_CAPABILITY_CHUNKING;
+	}
+
 	client->backend_capabilities_configured = TRUE;
 }