From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 6 Nov 2025 16:56:45 +0000 (+0200)
Subject: submission[-login]: If submission_max_mail_size=unlimited, advertise SIZE capability... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=734238a96a0706cf27712a63bd36fb9aee452d74;p=thirdparty%2Fdovecot%2Fcore.git

submission[-login]: If submission_max_mail_size=unlimited, advertise SIZE capability without a number
---

diff --git a/src/submission-login/client-authenticate.c b/src/submission-login/client-authenticate.c
index 3c21a05324..fed80dfad1 100644
--- a/src/submission-login/client-authenticate.c
+++ b/src/submission-login/client-authenticate.c
@@ -10,6 +10,7 @@
 #include "safe-memset.h"
 #include "str.h"
 #include "str-sanitize.h"
+#include "settings-parser.h"
 #include "auth-client.h"
 #include "ssl-settings.h"
 #include "client.h"
@@ -76,7 +77,8 @@ static void cmd_helo_reply(struct submission_client *subm_client,
 				reply, "ENHANCEDSTATUSCODES");
 		}
 
-		if (subm_client->set->submission_max_mail_size > 0) {
+		if (subm_client->set->submission_max_mail_size > 0 &&
+		    subm_client->set->submission_max_mail_size != SET_SIZE_UNLIMITED) {
 			smtp_server_reply_ehlo_add_param(reply,
 				"SIZE", "%"PRIuUOFF_T,
 				subm_client->set->submission_max_mail_size);
diff --git a/src/submission/submission-commands.c b/src/submission/submission-commands.c
index 33b2ceac9b..0a7fc5a068 100644
--- a/src/submission/submission-commands.c
+++ b/src/submission/submission-commands.c
@@ -5,6 +5,7 @@
 #include "istream.h"
 #include "istream-concat.h"
 #include "istream-seekable.h"
+#include "settings-parser.h"
 #include "mail-storage.h"
 #include "imap-url.h"
 #include "imap-msgpart.h"
@@ -87,7 +88,7 @@ void submission_helo_reply_submit(struct smtp_server_cmd_ctx *cmd,
 			"PIPELINING");
 
 		cap_size = client_get_max_mail_size(client);
-		if (cap_size > 0) {
+		if (cap_size > 0 && cap_size != SET_SIZE_UNLIMITED) {
 			smtp_server_reply_ehlo_add_param(reply,
 				"SIZE", "%"PRIuUOFF_T, cap_size);
 		} else {