git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd19f9a
)
Expand recipients_max, smtp-batch input
author
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 14 Feb 2024 11:25:52 +0000
(11:25 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 14 Feb 2024 11:25:52 +0000
(11:25 +0000)
src/src/smtp_in.c
patch
|
blob
|
history
diff --git
a/src/src/smtp_in.c
b/src/src/smtp_in.c
index 1d4c232a501bd665136269808dda92cbfa3cd613..2d977b97575e296c3b640d95f104f86b5d2ba3c5 100644
(file)
--- a/
src/src/smtp_in.c
+++ b/
src/src/smtp_in.c
@@
-1876,7
+1876,8
@@
while (done <= 0)
/* Check maximum number allowed */
/* 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");
/* 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);
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);
}
g = string_fmt_append(g, " RCPTMAX=%d", recipients_max_expanded);
g = string_catn(g, US"\r\n", 2);
}