[exim-cvs] Expand recipients_max, smtp-batch input

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Exim Git Commits Mailing List
Datum:  
To: exim-cvs
Betreff: [exim-cvs] Expand recipients_max, smtp-batch input
Gitweb: https://git.exim.org/exim.git/commitdiff/7502f0cbd3753de473a2279acaae15f9bbdfb5ee
Commit:     7502f0cbd3753de473a2279acaae15f9bbdfb5ee
Parent:     cd19f9a79c20f9c0c9d650a8aa21d9cc54a66620
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Feb 14 11:25:52 2024 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Feb 14 11:25:52 2024 +0000


    Expand recipients_max, smtp-batch input
---
 src/src/smtp_in.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 1d4c232a5..2d977b975 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -1876,7 +1876,8 @@ while (done <= 0)

       /* Check maximum number allowed */


-      if (recipients_max > 0 && recipients_count + 1 > recipients_max)
+      if (  recipients_max_expanded > 0
+     && recipients_count + 1 > recipients_max_expanded)
     /* The function moan_smtp_batch() does not return. */
     moan_smtp_batch(smtp_cmd_buffer, "%s too many recipients",
       recipients_max_reject ? "552": "452");
@@ -4066,7 +4067,7 @@ while (done <= 0)
       g = string_fmt_append(g, "%.3s-LIMITS", smtp_code);
       if (smtp_mailcmd_max > 0)
         g = string_fmt_append(g, " MAILMAX=%d", smtp_mailcmd_max);
-      if (recipients_max > 9)
+      if (recipients_max_expanded > 0)
         g = string_fmt_append(g, " RCPTMAX=%d", recipients_max_expanded);
       g = string_catn(g, US"\r\n", 2);
       }


--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/