submission,submission-login: Implicitly enable CHUNKING when submission_backend_capab...

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 3ab4f6931dafff2b598c1c7d120879f4e173a405..11e8429307ad5aee101ceb27da83be3e7a2c56c7 100644 (file)
--- 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 46160dfe08b1b373394fb6190260f127e94d87d2..1625fd37b9966ee6eb3ba2365728747b092fe284 100644 (file)
--- 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;
 }