Gitweb:
https://git.exim.org/exim.git/commitdiff/cd8cb71deb2d653228cc037cf91ecab980acdcd0
Commit: cd8cb71deb2d653228cc037cf91ecab980acdcd0
Parent: d0e4bb183c038fe38ee249c1bd096f49120e908a
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Feb 10 16:44:54 2024 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sat Feb 10 16:44:54 2024 +0000
Move ESMPT LIMITS extension from experimental to mainline
---
doc/doc-docbook/spec.xfpt | 36 +++++++++++++++++++++++++
doc/doc-txt/ChangeLog | 6 ++++-
doc/doc-txt/OptionLists.txt | 1 +
doc/doc-txt/experimental-spec.txt | 39 +--------------------------
src/src/config.h.defaults | 2 +-
src/src/exim.c | 8 +++---
src/src/functions.h | 2 +-
src/src/globals.c | 6 ++---
src/src/globals.h | 6 ++---
src/src/hintsdb_structs.h | 2 +-
src/src/macro_predef.c | 6 ++---
src/src/readconf.c | 2 +-
src/src/smtp_in.c | 2 +-
src/src/transport.c | 8 +++---
src/src/transports/smtp.c | 40 ++++++++++++++--------------
src/src/transports/smtp.h | 4 +--
test/log/5710 | 8 +++---
test/log/5720 | 8 +++---
test/scripts/0000-Basic/0035 | 11 +++++---
test/scripts/0000-Basic/0159 | 4 +++
test/scripts/0000-Basic/0282 | 2 ++
test/scripts/0000-Basic/0287 | 11 ++++----
test/scripts/0000-Basic/0300 | 5 ++++
test/scripts/0000-Basic/0301 | 3 +++
test/scripts/0000-Basic/0458 | 4 +++
test/scripts/0000-Basic/0460 | 1 +
test/scripts/0000-Basic/0502 | 1 +
test/scripts/0000-Basic/0547 | 2 ++
test/scripts/0000-Basic/0549 | 2 ++
test/scripts/0000-Basic/0556 | 3 +++
test/scripts/0000-Basic/0559 | 1 +
test/scripts/0000-Basic/0562 | 2 ++
test/scripts/0000-Basic/0579 | 1 +
test/scripts/0000-Basic/0581 | 5 ++++
test/scripts/0000-Basic/0583 | 1 +
test/scripts/0000-Basic/0612 | 7 +++++
test/scripts/0000-Basic/0628 | 2 ++
test/scripts/0000-Basic/0629 | 1 +
test/scripts/0000-Basic/0630 | 1 +
test/scripts/0000-Basic/0631 | 1 +
test/scripts/0000-Basic/0908 | 1 +
test/scripts/1000-Basic-ipv6/1001 | 3 +++
test/scripts/1100-Basic-TLS/1103 | 3 +++
test/scripts/1100-Basic-TLS/1104 | 2 ++
test/scripts/1100-Basic-TLS/1105 | 2 ++
test/scripts/1100-Basic-TLS/1106 | 1 +
test/scripts/1100-Basic-TLS/1107 | 2 ++
test/scripts/1100-Basic-TLS/1108 | 3 +++
test/scripts/1100-Basic-TLS/1110 | 1 +
test/scripts/1100-Basic-TLS/1111 | 1 +
test/scripts/1100-Basic-TLS/1112 | 2 ++
test/scripts/1190-TLS-ALPN/1190 | 1 +
test/scripts/2000-GnuTLS/2002 | 7 +++++
test/scripts/2000-GnuTLS/2014 | 9 +++++++
test/scripts/2000-GnuTLS/2024 | 2 ++
test/scripts/2000-GnuTLS/2029 | 1 +
test/scripts/2000-GnuTLS/2034 | 2 ++
test/scripts/2000-GnuTLS/2036 | 2 ++
test/scripts/2100-OpenSSL/2102 | 9 +++++++
test/scripts/2100-OpenSSL/2114 | 9 +++++++
test/scripts/2100-OpenSSL/2124 | 2 ++
test/scripts/2100-OpenSSL/2132 | 4 +++
test/scripts/2100-OpenSSL/2136 | 2 ++
test/scripts/2100-OpenSSL/2150 | 1 +
test/scripts/3400-plaintext/3415 | 4 +++
test/scripts/3450-plaintext-GnuTLS/3450 | 3 +++
test/scripts/3450-plaintext-GnuTLS/3453 | 2 ++
test/scripts/3450-plaintext-GnuTLS/3454 | 3 +++
test/scripts/3460-plaintext-OpenSSL/3460 | 3 +++
test/scripts/3460-plaintext-OpenSSL/3463 | 2 ++
test/scripts/3460-plaintext-OpenSSL/3464 | 3 +++
test/scripts/3600-SPA/3600 | 2 ++
test/scripts/3720-external-auth-GnuTLS/3720 | 2 ++
test/scripts/3721-external-auth-OpenSSL/3721 | 2 ++
test/scripts/3800-Cyrus-SASL/3800 | 1 +
test/scripts/3820-Gnu-SASL/3820 | 1 +
test/scripts/4032-xclient/4032 | 6 +++++
test/scripts/4034-xclient-tls/4034 | 10 +++++++
test/scripts/4200-International/4201 | 3 +++
test/scripts/4210-GnuTLS-International/4211 | 2 ++
test/scripts/4220-OpenSSL-International/4221 | 2 ++
test/scripts/4500-DKIM/4519 | 2 ++
test/scripts/4520-TLS-DKIM/4520 | 6 +++++
test/scripts/4520-TLS-DKIM/4521 | 2 ++
test/scripts/4520-TLS-DKIM/4522 | 4 +++
test/scripts/4520-TLS-DKIM/4523 | 1 +
test/scripts/4520-TLS-DKIM/4524 | 1 +
test/scripts/4520-TLS-DKIM/4526 | 8 ++++++
test/scripts/4520-TLS-DKIM/4528 | 4 +++
test/scripts/4520-TLS-DKIM/4529 | 1 +
test/scripts/4520-TLS-DKIM/4539 | 2 ++
test/scripts/4710-esmtp-limits/REQUIRES | 2 +-
test/scripts/5500-PRDR/5500 | 6 +++++
test/scripts/5600-OCSP-OpenSSL/5600 | 5 ++++
test/scripts/5600-OCSP-OpenSSL/5610 | 5 ++++
test/scripts/5650-OCSP-GnuTLS/5650 | 5 ++++
test/stderr/0038 | 12 +++++++++
test/stderr/0043 | 2 ++
test/stderr/0044 | 8 ++++++
test/stderr/0070 | 2 ++
test/stderr/0079 | 2 ++
test/stderr/0080 | 2 ++
test/stderr/0121 | 10 +++++++
test/stderr/0138 | 4 +++
test/stderr/0180 | 4 +++
test/stderr/0243 | 2 ++
test/stderr/0303 | 8 ++++++
test/stderr/0371 | 3 +++
test/stderr/0384 | 2 ++
test/stderr/0487 | 3 +++
test/stderr/0513 | 2 ++
test/stderr/0524 | 8 ++++++
test/stderr/0537 | 2 ++
test/stderr/0634 | 6 +++++
test/stderr/1150 | 6 +++++
test/stderr/1157 | 10 +++++++
test/stderr/1160 | 3 +++
test/stderr/2035 | 2 ++
test/stderr/2135 | 2 ++
test/stderr/3000 | 2 ++
test/stderr/3208 | 2 ++
test/stderr/3400 | 9 +++++++
test/stderr/3408 | 4 +++
test/stderr/3410 | 6 +++++
test/stderr/3500 | 6 +++++
test/stderr/4001 | 2 ++
test/stderr/4510 | 1 +
test/stderr/4530 | 2 ++
test/stderr/5204 | 2 ++
test/stderr/5403 | 4 +++
test/stderr/5410 | 10 +++++++
test/stderr/5420 | 10 +++++++
test/stderr/5820 | 2 ++
test/stderr/5840 | 2 ++
test/stdout/0019 | 1 +
test/stdout/0028 | 1 +
test/stdout/0034 | 11 ++++++++
test/stdout/0035 | 14 +++++++---
test/stdout/0038 | 6 +++++
test/stdout/0043 | 1 +
test/stdout/0044 | 3 +++
test/stdout/0070 | 1 +
test/stdout/0079 | 3 +++
test/stdout/0080 | 1 +
test/stdout/0121 | 5 ++++
test/stdout/0138 | 2 ++
test/stdout/0159 | 8 ++++++
test/stdout/0180 | 4 +++
test/stdout/0181 | 1 +
test/stdout/0227 | 4 +++
test/stdout/0243 | 1 +
test/stdout/0282 | 4 +++
test/stdout/0287 | 12 +++++----
test/stdout/0300 | 10 +++++++
test/stdout/0301 | 6 +++++
test/stdout/0303 | 3 +++
test/stdout/0371 | 1 +
test/stdout/0384 | 1 +
test/stdout/0448 | 2 ++
test/stdout/0451 | 1 +
test/stdout/0458 | 8 ++++++
test/stdout/0460 | 2 ++
test/stdout/0473 | 12 +++++++++
test/stdout/0485 | 1 +
test/stdout/0486 | 1 +
test/stdout/0487 | 1 +
test/stdout/0495 | 2 ++
test/stdout/0502 | 2 ++
test/stdout/0513 | 1 +
test/stdout/0524 | 4 +++
test/stdout/0536 | 2 ++
test/stdout/0537 | 2 ++
test/stdout/0544 | 1 +
test/stdout/0546 | 3 +++
test/stdout/0547 | 4 +++
test/stdout/0549 | 4 +++
test/stdout/0556 | 6 +++++
test/stdout/0558 | 2 ++
test/stdout/0559 | 2 ++
test/stdout/0562 | 4 +++
test/stdout/0566 | 14 ++++++++++
test/stdout/0579 | 2 ++
test/stdout/0583 | 2 ++
test/stdout/0612 | 14 ++++++++++
test/stdout/0628 | 4 +++
test/stdout/0629 | 2 ++
test/stdout/0630 | 2 ++
test/stdout/0631 | 2 ++
test/stdout/0908 | 2 ++
test/stdout/1001 | 6 +++++
test/stdout/1103 | 6 +++++
test/stdout/1104 | 4 +++
test/stdout/1105 | 4 +++
test/stdout/1106 | 2 ++
test/stdout/1107 | 4 +++
test/stdout/1108 | 6 +++++
test/stdout/1109 | 1 +
test/stdout/1110 | 2 ++
test/stdout/1111 | 2 ++
test/stdout/1112 | 4 +++
test/stdout/2002 | 14 ++++++++++
test/stdout/2014 | 18 +++++++++++++
test/stdout/2024 | 4 +++
test/stdout/2029 | 2 ++
test/stdout/2034 | 4 +++
test/stdout/2102 | 18 +++++++++++++
test/stdout/2114.openssl_1_1_1 | 18 +++++++++++++
test/stdout/2124.openssl_1_1_1 | 4 +++
test/stdout/2132.openssl_1_1_1 | 8 ++++++
test/stdout/2150 | 2 ++
test/stdout/3000 | 2 ++
test/stdout/3208 | 1 +
test/stdout/3400 | 22 +++++++++++++++
test/stdout/3402 | 2 ++
test/stdout/3403 | 1 +
test/stdout/3406 | 4 +++
test/stdout/3408 | 2 ++
test/stdout/3409 | 2 ++
test/stdout/3410 | 3 +++
test/stdout/3411 | 1 +
test/stdout/3413 | 1 +
test/stdout/3414 | 6 +++++
test/stdout/3415 | 8 ++++++
test/stdout/3416 | 3 +++
test/stdout/3418 | 2 ++
test/stdout/3450 | 6 +++++
test/stdout/3453 | 4 +++
test/stdout/3454 | 6 +++++
test/stdout/3460 | 6 +++++
test/stdout/3463 | 4 +++
test/stdout/3464 | 6 +++++
test/stdout/3500 | 5 ++++
test/stdout/3600 | 4 +++
test/stdout/3720 | 4 +++
test/stdout/3721 | 4 +++
test/stdout/3800 | 2 ++
test/stdout/3820 | 2 ++
test/stdout/4000 | 8 ++++++
test/stdout/4001 | 1 +
test/stdout/4002 | 2 ++
test/stdout/4003 | 4 +++
test/stdout/4004 | 1 +
test/stdout/4006 | 7 +++++
test/stdout/4007 | 6 +++++
test/stdout/4008 | 4 +++
test/stdout/4009 | 5 ++++
test/stdout/4010 | 5 ++++
test/stdout/4011 | 7 +++++
test/stdout/4012 | 4 +++
test/stdout/4013 | 4 +++
test/stdout/4014 | 2 ++
test/stdout/4015 | 1 +
test/stdout/4017 | 6 +++++
test/stdout/4020 | 2 ++
test/stdout/4021 | 2 ++
test/stdout/4027 | 3 +++
test/stdout/4033 | 6 +++++
test/stdout/4201 | 7 +++++
test/stdout/4203 | 1 +
test/stdout/4204 | 4 +++
test/stdout/4205 | 1 +
test/stdout/4206 | 4 +++
test/stdout/4207 | 3 +++
test/stdout/4208 | 2 ++
test/stdout/4211 | 5 ++++
test/stdout/4213 | 1 +
test/stdout/4214 | 4 +++
test/stdout/4215 | 1 +
test/stdout/4216 | 4 +++
test/stdout/4221 | 5 ++++
test/stdout/4223 | 1 +
test/stdout/4224 | 4 +++
test/stdout/4225 | 1 +
test/stdout/4226 | 4 +++
test/stdout/4519 | 4 +++
test/stdout/4539 | 4 +++
test/stdout/5204 | 1 +
test/stdout/5400 | 11 ++++++++
test/stdout/5401 | 3 +++
test/stdout/5402 | 2 ++
test/stdout/5403 | 2 ++
test/stdout/5404 | 1 +
test/stdout/5405 | 10 +++++++
test/stdout/5406 | 2 ++
test/stdout/5407 | 1 +
test/stdout/5409 | 1 +
test/stdout/5410 | 3 +++
test/stdout/5420 | 3 +++
test/stdout/5500 | 12 +++++++++
test/stdout/5600 | 10 +++++++
test/stdout/5610 | 10 +++++++
test/stdout/5650 | 10 +++++++
292 files changed, 1176 insertions(+), 110 deletions(-)
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 79bdb24e5..902f8e72f 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -14972,6 +14972,7 @@ See also the &'Policy controls'& section above.
.row &%dsn_advertise_hosts%& "advertise DSN extensions to these hosts"
.row &%ignore_fromline_hosts%& "allow &""From ""& from these hosts"
.row &%ignore_fromline_local%& "allow &""From ""& from local SMTP"
+.row &%limits_advertise_hosts%& "advertise LIMITS to these hosts"
.row &%pipelining_advertise_hosts%& "advertise pipelining to these hosts"
.row &%pipelining_connect_advertise_hosts%& "advertise pipelining to these hosts"
.row &%prdr_enable%& "advertise PRDR to all hosts"
@@ -16556,6 +16557,18 @@ has been built with LDAP support.
+.new
+.option limits_advertise_hosts main "host list&!!" *
+.cindex LIMITS "suppressing advertising"
+.cindex "ESMTP extensions" LIMITS
+This option can be used to suppress the advertisement of the SMTP
+LIMITS extension (RFC 9422) to specific hosts.
+If permitted, Exim as a servier will advertise in the EHLO response
+the limit for RCPT commands set by the &%recipients_max%& option (if it is set)
+and the limit for MAIL commands set by the &%smtp_accept_max_per_connection%&
+option.
+,wen
+
.option local_from_check main boolean true
.cindex "&'Sender:'& header line" "disabling addition of"
.cindex "&'From:'& header line" "disabling checking of"
@@ -25356,6 +25369,13 @@ over a single TCP/IP connection. If the value is zero, there is no limit.
For testing purposes, this value can be overridden by the &%-oB%& command line
option.
+.new
+.cindex "ESMTP extensions" LIMITS
+If the peer advertises a LIMITS extension with a MAILMAX value,
+and either TLSS is in use or was not advertised,
+that value also constrains the result of this option.
+.wen
+
.option dane_require_tls_ciphers smtp string&!! unset
.cindex "TLS" "requiring specific ciphers for DANE"
@@ -25932,6 +25952,14 @@ each set of addresses is treated independently, and
so can cause parallel connections to the same host if &%remote_max_parallel%&
permits this.
+.new
+.cindex "ESMTP extensions" LIMITS
+If the peer advertises a LIMITS extension with a RCPTMAX value,
+and either TLSS is in use or was not advertised,
+that value also constrains the result of this option
+and no parallel connections will be caused on meeting the RCPTMAX limit.
+.wen
+
.option message_linelength_limit smtp integer 998
.cindex "line length" limit
@@ -25963,6 +25991,14 @@ If the connection is DANE-enabled then this option is ignored;
only messages having the domain used for the DANE TLSA lookup are
sent on the connection.
+.new
+.cindex "ESMTP extensions" LIMITS
+If the peer advertises a LIMITS extension with a RCPTDOMAINMAX value,
+and either TLSS is in use or was not advertised,
+this option is regarded as being false.
+.wen
+
+
.option port smtp string&!! "see below"
.cindex "port" "sending TCP/IP"
.cindex "TCP/IP" "setting outgoing port"
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 4287e41e5..2dab6775a 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -67,7 +67,7 @@ JH/13 Add an fdatasync call for the received message data file in spool, before
loggging reception and sending the SMTP ack. Previously we only flushed
the stdio buffer so there was still the possibility of a disk error.
-JH/14 Bug 3061: Avoid a split log line when trtying to rewrite a malformed
+JH/14 Bug 3061: Avoid a split log line when trying to rewrite a malformed
address. Previously, for the last address in a header line (commonly
there is only one) the terminating newline was part of the logged
information.
@@ -115,6 +115,10 @@ JH/21 Bug 3059: Fix crash in smtp transport. When running for a message for
message-level status to ok if there was a close but all recipients were
dealt with. Thanks to Wolfgand Breyha for debug runs.
+JH/22 The ESMTP_LIMITS facility (RFC 9422) is promoted from experimental status
+ and is now controlled by the build-time option DISABLE_ESMTP_LIMITS..
+
+
Exim version 4.97
-----------------
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index ee62cad48..4d7117697 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -343,6 +343,7 @@ keep_malformed time 4d main
keepalive boolean true smtp 2.05
ldap_default_servers string list unset main 3.02
ldap_version int 2 or 3 main 4.14
+limits_advertise_hosts host list * main 4.98
local_from_check boolean true main 3.14
local_from_prefix string unset main 3.14
local_from_suffix string unset main 3.14
diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index f61db629e..aa3a278fd 100644
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -616,7 +616,7 @@ and a whitespace-separated port number must be given.
Logging protocol unusual states
---------------------------------------------------------------
An extra log_selector, "protocol_detail" has been added in the default build.
-The name may change in future, hence the Experimenal status.
+The name may change in future, hence the Experimental status.
Currrently the only effect is to enable logging, under TLS,
of a TCP RST received directly after a QUIT (in server mode).
@@ -628,43 +628,6 @@ being logged.
-Limits ESMTP extension
----------------------------------------------------------------
-Per https://datatracker.ietf.org/doc/html/draft-freed-smtp-limits-01
-(as of 2023/08/04, version -05 has been published. It does not seems
-to be substantively different.)
-
-If compiled with EXPERIMENTAL_ESMTP_LIMITS=yes :-
-
-As a server, Exim will advertise, in the EHLO response, the limit for RCPT
-commands set by the recipients_max main-section config option (if it is set),
-and the limit for MAIL commands set by the smtp_accept_max_per_connection
-option.
-
-Note that as of writing, smtp_accept_max_per_connection is expanded but
-recipients_max is not.
-
-A new main-section option "limits_advertise_hosts" controls whether
-the limits are advertised; the default for the option is "*".
-
-As a client, Exim will:
-
- - note an advertised MAILMAX; the lower of the value given and the
- value from the transport connection_max_messages option is used.
-
- - note an advertised RCPTMAX; the lower of the
- value given and the value from the transport max_rcpt option is used.
- Parallisation of transactions is not done if due to a RCPTMAX, unlike
- max_rcpt.
-
- - note an advertised RCPTDOMAINMAX, and behave as if the transport
- multi_domains option was set to false. The value advertised is ignored.
-
-Values advertised are only noted for TLS connections and ones for which
-the server does not advertise TLS support.
-
-
-
XCLIENT proxy support
---------------------------------------------------------------
Per https://www.postfix.org/XCLIENT_README.html
diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 28d4f13f7..c08f1874d 100644
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -51,6 +51,7 @@ Do not put spaces between # and the 'define'.
#define DISABLE_D_OPTION
#define DISABLE_DNSSEC
#define DISABLE_DKIM
+#define DISABLE_ESMTP_LIMITS
#define DISABLE_EVENT
#define DISABLE_OCSP
#define DISABLE_PIPE_CONNECT
@@ -209,7 +210,6 @@ Do not put spaces between # and the 'define'.
#define EXPERIMENTAL_BRIGHTMAIL
#define EXPERIMENTAL_DCC
#define EXPERIMENTAL_DSN_INFO
-#define EXPERIMENTAL_ESMTP_LIMITS
#define EXPERIMENTAL_QUEUEFILE
#define EXPERIMENTAL_XCLIENT
diff --git a/src/src/exim.c b/src/src/exim.c
index e5b72f11a..1f76f8f14 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1105,6 +1105,9 @@ g = string_cat(g, US"Support for:");
#ifndef DISABLE_DNSSEC
g = string_cat(g, US" DNSSEC");
#endif
+#ifndef DISABLE_ESMTP_LIMITS
+ g = string_cat(g, US" ESMTP_Limits");
+#endif
#ifndef DISABLE_EVENT
g = string_cat(g, US" Event");
#endif
@@ -1151,9 +1154,6 @@ g = string_cat(g, US"Support for:");
#ifdef EXPERIMENTAL_DSN_INFO
g = string_cat(g, US" Experimental_DSN_info");
#endif
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
- g = string_cat(g, US" Experimental_ESMTP_Limits");
-#endif
#ifdef EXPERIMENTAL_QUEUEFILE
g = string_cat(g, US" Experimental_QUEUEFILE");
#endif
@@ -3019,7 +3019,7 @@ on the second character (the one after '-'), to save some effort. */
case 'K': smtp_peer_options |= OPTION_CHUNKING; break;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
/* -MCL: peer used LIMITS RCPTMAX and/or RCPTDOMAINMAX */
case 'L': if (++i < argc) continue_limit_mail = Uatoi(argv[i]);
else badarg = TRUE;
diff --git a/src/src/functions.h b/src/src/functions.h
index ef84e3d7c..77323a5c1 100644
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -632,7 +632,7 @@ extern void transport_do_pass_socket(const uschar *, const uschar *,
const uschar *, uschar *, int);
extern void transport_init(void);
extern BOOL transport_pass_socket(const uschar *, const uschar *, const uschar *, uschar *, int
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
, unsigned, unsigned, unsigned
#endif
);
diff --git a/src/src/globals.c b/src/src/globals.c
index c535ea121..c483ab182 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -706,7 +706,7 @@ unsigned chunking_data_left = 0;
chunking_state_t chunking_state= CHUNKING_NOT_OFFERED;
const pcre2_code *regex_CHUNKING = NULL;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
const pcre2_code *regex_LIMITS = NULL;
#endif
@@ -746,7 +746,7 @@ uschar *continue_hostname = NULL;
uschar *continue_host_address = NULL;
int continue_sequence = 1;
uschar *continue_transport = NULL;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
unsigned continue_limit_mail = 0;
unsigned continue_limit_rcpt = 0;
unsigned continue_limit_rcptdom= 0;
@@ -1029,7 +1029,7 @@ const uschar *letter_digit_hyphen_dot =
US"abcdefghijklmnopqrstuvwxyz"
".-0123456789"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
uschar *limits_advertise_hosts = US"*";
#endif
int load_average = -2;
diff --git a/src/src/globals.h b/src/src/globals.h
index ffc7150f2..b5c3a520e 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -449,7 +449,7 @@ extern uschar *continue_hostname; /* Host for continued delivery */
extern uschar *continue_host_address; /* IP address for ditto */
extern int continue_sequence; /* Sequence num for continued delivery */
extern uschar *continue_transport; /* Transport for continued delivery */
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
extern unsigned continue_limit_mail; /* Peer advertised limit */
extern unsigned continue_limit_rcpt;
extern unsigned continue_limit_rcptdom;
@@ -688,7 +688,7 @@ extern int keep_malformed; /* Time to keep malformed messages */
extern uschar *eldap_dn; /* Where LDAP DNs are left */
extern const uschar *letter_digit_hyphen_dot; /* Legitimate DNS host name chars */
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
extern uschar *limits_advertise_hosts; /* for banner/EHLO pipelining */
#endif
extern int load_average; /* Most recently read load average */
@@ -902,7 +902,7 @@ extern const pcre2_code *regex_check_dns_names; /* For DNS name checking */
extern const pcre2_code *regex_From; /* For recognizing "From_" lines */
extern const pcre2_code *regex_CHUNKING; /* For recognizing CHUNKING (RFC 3030) */
extern const pcre2_code *regex_IGNOREQUOTA; /* For recognizing IGNOREQUOTA (LMTP) */
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
extern const pcre2_code *regex_LIMITS; /* For recognizing LIMITS */
#endif
extern const pcre2_code *regex_PIPELINING; /* For recognizing PIPELINING */
diff --git a/src/src/hintsdb_structs.h b/src/src/hintsdb_structs.h
index 0e5853b2b..5da311c2b 100644
--- a/src/src/hintsdb_structs.h
+++ b/src/src/hintsdb_structs.h
@@ -163,7 +163,7 @@ typedef struct {
unsigned short cleartext_auths;
unsigned short crypted_auths;
-# ifdef EXPERIMENTAL_ESMTP_LIMITS
+# ifndef DISABLE_ESMTP_LIMITS
unsigned int limit_mail;
unsigned int limit_rcpt;
unsigned int limit_rcptdom;
diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c
index bdc587502..9b354d345 100644
--- a/src/src/macro_predef.c
+++ b/src/src/macro_predef.c
@@ -160,6 +160,9 @@ due to conflicts with other common macros. */
#ifndef DISABLE_DNSSEC
builtin_macro_create(US"_HAVE_DNSSEC");
#endif
+#ifndef DISABLE_ESMTP_LIMITS
+ builtin_macro_create(US"_HAVE_ESMTP_LIMITS");
+#endif
#ifndef DISABLE_EVENT
builtin_macro_create(US"_HAVE_EVENT");
#endif
@@ -309,9 +312,6 @@ exp_features(void)
#ifdef EXPERIMENTAL_DSN_INFO
builtin_macro_create(US"_EXP_DSNI");
#endif
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
- builtin_macro_create(US"_EXP_LIMITS");
-#endif
#ifdef EXPERIMENTAL_QUEUEFILE
builtin_macro_create(US"_EXP_QUEUEFILE");
#endif
diff --git a/src/src/readconf.c b/src/src/readconf.c
index bbcca87f7..8ee6e9fe0 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -209,7 +209,7 @@ static optionlist optionlist_config[] = {
{ "ldap_start_tls", opt_bool, {&eldap_start_tls} },
{ "ldap_version", opt_int, {&eldap_version} },
#endif
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
{ "limits_advertise_hosts", opt_stringptr, {&limits_advertise_hosts} },
#endif
{ "local_from_check", opt_bool, {&local_from_check} },
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 541288301..a57c9821e 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -4054,7 +4054,7 @@ while (done <= 0)
g = string_catn(g, US"-SIZE\r\n", 7);
}
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
if ( (smtp_mailcmd_max > 0 || recipients_max)
&& verify_check_host(&limits_advertise_hosts) == OK)
{
diff --git a/src/src/transport.c b/src/src/transport.c
index 79a69f941..5729f8e75 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -1941,7 +1941,7 @@ const uschar **argv;
#ifndef DISABLE_TLS
if (smtp_peer_options & OPTION_TLS) i += 6;
#endif
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
if (continue_limit_mail || continue_limit_rcpt || continue_limit_rcptdom)
i += 4;
#endif
@@ -1983,7 +1983,7 @@ if (smtp_peer_options & OPTION_TLS)
argv[i++] = US"-MCT";
#endif
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
if (continue_limit_rcpt || continue_limit_rcptdom)
{
argv[i++] = US"-MCL";
@@ -2055,7 +2055,7 @@ Returns: FALSE if fork fails; TRUE otherwise
BOOL
transport_pass_socket(const uschar *transport_name, const uschar *hostname,
const uschar *hostaddress, uschar *id, int socket_fd
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
, unsigned peer_limit_mail, unsigned peer_limit_rcpt, unsigned peer_limit_rcptdom
#endif
)
@@ -2065,7 +2065,7 @@ int status;
DEBUG(D_transport) debug_printf("transport_pass_socket entered\n");
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
continue_limit_mail = peer_limit_mail;
continue_limit_rcpt = peer_limit_rcpt;
continue_limit_rcptdom = peer_limit_rcptdom;
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index c205145a7..596a328c3 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -277,7 +277,7 @@ struct list
#ifndef DISABLE_PIPE_CONNECT
{ ®ex_EARLY_PIPE, US"\\n250[\\s\\-]" EARLY_PIPE_FEATURE_NAME "(\\s|\\n|$)" },
#endif
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
{ ®ex_LIMITS, US"\\n250[\\s\\-]LIMITS\\s" },
#endif
};
@@ -797,7 +797,7 @@ sx->conn_args.have_lbserver = TRUE;
/******************************************************************************/
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
/* If TLS, or TLS not offered, called with the EHLO response in the buffer.
Check it for a LIMITS keyword and parse values into the smtp context structure.
@@ -900,7 +900,7 @@ write_ehlo_cache_entry(smtp_context * sx)
{
open_db dbblock, * dbm_file;
-# ifdef EXPERIMENTAL_ESMTP_LIMITS
+# ifndef DISABLE_ESMTP_LIMITS
sx->ehlo_resp.limit_mail = sx->peer_limit_mail;
sx->ehlo_resp.limit_rcpt = sx->peer_limit_rcpt;
sx->ehlo_resp.limit_rcptdom = sx->peer_limit_rcptdom;
@@ -912,7 +912,7 @@ if ((dbm_file = dbfn_open(US"misc", O_RDWR, &dbblock, TRUE, TRUE)))
dbdata_ehlo_resp er = { .data = sx->ehlo_resp };
HDEBUG(D_transport)
-# ifdef EXPERIMENTAL_ESMTP_LIMITS
+# ifndef DISABLE_ESMTP_LIMITS
if (sx->ehlo_resp.limit_mail || sx->ehlo_resp.limit_rcpt || sx->ehlo_resp.limit_rcptdom)
debug_printf("writing clr %04x/%04x cry %04x/%04x lim %05d/%05d/%05d\n",
sx->ehlo_resp.cleartext_features, sx->ehlo_resp.cleartext_auths,
@@ -979,7 +979,7 @@ else
else
{
DEBUG(D_transport)
-# ifdef EXPERIMENTAL_ESMTP_LIMITS
+# ifndef DISABLE_ESMTP_LIMITS
if (er->data.limit_mail || er->data.limit_rcpt || er->data.limit_rcptdom)
debug_printf("EHLO response bits from cache:"
" cleartext 0x%04x/0x%04x crypted 0x%04x/0x%04x lim %05d/%05d/%05d\n",
@@ -994,7 +994,7 @@ else
er->data.crypted_features, er->data.crypted_auths);
sx->ehlo_resp = er->data;
-# ifdef EXPERIMENTAL_ESMTP_LIMITS
+# ifndef DISABLE_ESMTP_LIMITS
ehlo_cache_limits_apply(sx);
# endif
dbfn_close(dbm_file);
@@ -1120,7 +1120,7 @@ if (pending_EHLO)
| OPTION_CHUNKING | OPTION_PRDR | OPTION_DSN | OPTION_PIPE | OPTION_SIZE
| OPTION_UTF8 | OPTION_EARLY_PIPE
);
-# ifdef EXPERIMENTAL_ESMTP_LIMITS
+# ifndef DISABLE_ESMTP_LIMITS
if (tls_out.active.sock >= 0 || !(peer_offered & OPTION_TLS))
ehlo_response_limits_read(sx);
# endif
@@ -1147,7 +1147,7 @@ if (pending_EHLO)
return OK; /* just carry on */
}
-# ifdef EXPERIMENTAL_ESMTP_LIMITS
+# ifndef DISABLE_ESMTP_LIMITS
/* If we are handling LIMITS, compare the actual EHLO LIMITS values with the
cached values and invalidate cache if different. OK to carry on with
connect since values are advisory. */
@@ -2305,7 +2305,7 @@ if (!continue_hostname)
sx->cctx.tls_ctx = NULL;
sx->inblock.cctx = sx->outblock.cctx = &sx->cctx;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
sx->peer_limit_mail = sx->peer_limit_rcpt = sx->peer_limit_rcptdom =
#endif
sx->avoid_option = sx->peer_offered = smtp_peer_options = 0;
@@ -2607,7 +2607,7 @@ goto SEND_QUIT;
)
#endif
);
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
if (tls_out.active.sock >= 0 || !(sx->peer_offered & OPTION_TLS))
{
ehlo_response_limits_read(sx);
@@ -2672,7 +2672,7 @@ else
sx->inblock.cctx = sx->outblock.cctx = &sx->cctx;
smtp_command = big_buffer;
sx->peer_offered = smtp_peer_options;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
/* Limits passed by cmdline over exec. */
ehlo_limits_apply(sx,
sx->peer_limit_mail = continue_limit_mail,
@@ -3000,7 +3000,7 @@ if ( !continue_hostname
sx->ehlo_resp.crypted_features = sx->peer_offered;
#endif
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
if (tls_out.active.sock >= 0 || !(sx->peer_offered & OPTION_TLS))
{
ehlo_response_limits_read(sx);
@@ -3423,7 +3423,7 @@ sw_mrc_t
smtp_write_mail_and_rcpt_cmds(smtp_context * sx, int * yield)
{
address_item * addr;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
address_item * restart_addr = NULL;
#endif
int address_count, pipe_limit;
@@ -3517,7 +3517,7 @@ for (addr = sx->first_addr, address_count = 0, pipe_limit = 100;
BOOL no_flush;
const uschar * rcpt_addr;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
if ( sx->single_rcpt_domain /* restriction on domains */
&& address_count > 0 /* not first being sent */
&& Ustrcmp(addr->domain, sx->first_addr->domain) != 0 /* dom diff from first */
@@ -3606,7 +3606,7 @@ for (addr = sx->first_addr, address_count = 0, pipe_limit = 100;
}
} /* Loop for next address */
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
sx->next_addr = restart_addr ? restart_addr : addr;
#else
sx->next_addr = addr;
@@ -3790,7 +3790,7 @@ uschar *message = NULL;
uschar new_message_id[MESSAGE_ID_LENGTH + 1];
smtp_context * sx = store_get(sizeof(*sx), GET_TAINTED); /* tainted, for the data buffers */
BOOL pass_message = FALSE;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
BOOL mail_limit = FALSE;
#endif
#ifdef SUPPORT_DANE
@@ -4674,7 +4674,7 @@ DEBUG(D_transport)
sx->send_rset, f.continue_more, yield, sx->first_addr ? "not " : "");
if (sx->completed_addr && sx->ok && sx->send_quit)
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
if (mail_limit = continue_sequence >= sx->max_mail)
{
DEBUG(D_transport)
@@ -4735,7 +4735,7 @@ if (sx->completed_addr && sx->ok && sx->send_quit)
if (sx->first_addr) /* More addresses still to be sent */
{ /* for this message */
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
/* Any that we marked as skipped, reset to do now */
for (address_item * a = sx->first_addr; a; a = a->next)
if (a->transport_return == SKIP)
@@ -4810,7 +4810,7 @@ if (sx->completed_addr && sx->ok && sx->send_quit)
*/
if (sx->ok && transport_pass_socket(tblock->name, host->name,
host->address, new_message_id, socket_fd
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
, sx->peer_limit_mail, sx->peer_limit_rcpt, sx->peer_limit_rcptdom
#endif
))
@@ -4987,7 +4987,7 @@ if (dane_held)
}
#endif
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
if (mail_limit && sx->first_addr)
{
/* Reset the sequence count since we closed the connection. This is flagged
diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
index ef9135838..fc8a6b126 100644
--- a/src/src/transports/smtp.h
+++ b/src/src/transports/smtp.h
@@ -176,7 +176,7 @@ typedef struct {
BOOL pending_BDAT:1;
BOOL RCPT_452:1;
BOOL good_RCPT:1;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
BOOL single_rcpt_domain:1;
#endif
BOOL completed_addr:1;
@@ -185,7 +185,7 @@ typedef struct {
BOOL send_tlsclose:1;
unsigned peer_offered;
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
unsigned peer_limit_mail;
unsigned peer_limit_rcpt;
unsigned peer_limit_rcptdom;
diff --git a/test/log/5710 b/test/log/5710
index f9ffee773..1fe7b1d5e 100644
--- a/test/log/5710
+++ b/test/log/5710
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=p1234 -qf
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-LIMITS MAILMAX=1000 RCPTMAX=50000\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
1999-03-02 09:44:33 10HmaX-000000005vi-0000 cipher_
1999-03-02 09:44:33 10HmaX-000000005vi-0000 ver:
1999-03-02 09:44:33 10HmaX-000000005vi-0000 tls:cert depth=0 <CN=server1.example.com>
@@ -23,7 +23,7 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 SAN <alternatename2.server1.example.com:*.test.ex:server1.example.com:alternatename.server1.example.com>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 SAN <alternatename2.server1.example.com:*.test.ex:server1.example.com:alternatename.server1.example.com>
1999-03-02 09:44:33 10HmaX-000000005vi-0000 TLS session: (certificate verification failed): certificate invalid: delivering unencrypted to H=127.0.0.1 [127.0.0.1] (not in hosts_require_tls)
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-LIMITS MAILMAX=1000 RCPTMAX=50000\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
1999-03-02 09:44:33 10HmaX-000000005vi-0000 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
1999-03-02 09:44:33 10HmaX-000000005vi-0000 ver:
1999-03-02 09:44:33 10HmaX-000000005vi-0000 => bad@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-000000005vi-0000"
@@ -31,11 +31,11 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 NO CLIENT CERT presented
1999-03-02 09:44:33 10HmaX-000000005vi-0000 No Peer cert
1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-LIMITS MAILMAX=1000 RCPTMAX=50000\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
1999-03-02 09:44:33 10HmaY-000000005vi-0000 cipher_
1999-03-02 09:44:33 10HmaY-000000005vi-0000 ver:
1999-03-02 09:44:33 10HmaY-000000005vi-0000 tls:cert depth=0 <CN=server1.example.com>
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 TLS1.x:ke-RSA-AES256-SHAnnn:xxx smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250 HELP
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 TLS1.x:ke-RSA-AES256-SHAnnn:xxx smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-LIMITS MAILMAX=1000 RCPTMAX=50000\n250-8BITMIME\n250-PIPELINING\n250 HELP
1999-03-02 09:44:33 10HmaY-000000005vi-0000 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
1999-03-02 09:44:33 10HmaY-000000005vi-0000 ver: TLS1.x
1999-03-02 09:44:33 10HmaY-000000005vi-0000 => good@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbA-000000005vi-0000"
diff --git a/test/log/5720 b/test/log/5720
index 8fed1a972..61da6f83c 100644
--- a/test/log/5720
+++ b/test/log/5720
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@??? U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=p1234 -qf
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-LIMITS MAILMAX=1000 RCPTMAX=50000\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
1999-03-02 09:44:33 10HmaX-000000005vi-0000 cipher_
1999-03-02 09:44:33 10HmaX-000000005vi-0000 ver:
1999-03-02 09:44:33 10HmaX-000000005vi-0000 [127.0.0.1] SSL verify error: depth=2 error=self signed certificate in certificate chain cert=/O=example.com/CN=clica CA rsa
@@ -23,7 +23,7 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 (no SAN)
1999-03-02 09:44:33 10HmaX-000000005vi-0000 (no SAN)
1999-03-02 09:44:33 10HmaX-000000005vi-0000 TLS session: (SSL_connect): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmaX-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-LIMITS MAILMAX=1000 RCPTMAX=50000\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
1999-03-02 09:44:33 10HmaX-000000005vi-0000 cipher_
1999-03-02 09:44:33 10HmaX-000000005vi-0000 ver:
1999-03-02 09:44:33 10HmaX-000000005vi-0000 => bad@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-000000005vi-0000"
@@ -31,13 +31,13 @@
1999-03-02 09:44:33 10HmaX-000000005vi-0000 NO CLIENT CERT presented
1999-03-02 09:44:33 10HmaX-000000005vi-0000 No Peer cert
1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-LIMITS MAILMAX=1000 RCPTMAX=50000\n250-8BITMIME\n250-PIPELINING\n250-STARTTLS\n250 HELP
1999-03-02 09:44:33 10HmaY-000000005vi-0000 cipher_
1999-03-02 09:44:33 10HmaY-000000005vi-0000 ver:
1999-03-02 09:44:33 10HmaY-000000005vi-0000 tls:cert depth=2 <CN=clica CA rsa,O=example.com>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 tls:cert depth=1 <CN=clica Signing Cert rsa,O=example.com>
1999-03-02 09:44:33 10HmaY-000000005vi-0000 tls:cert depth=0 <CN=server1.example.com>
-1999-03-02 09:44:33 10HmaY-000000005vi-0000 TLS1.x:ke-RSA-AES256-SHAnnn:xxx smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-8BITMIME\n250-PIPELINING\n250 HELP
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 TLS1.x:ke-RSA-AES256-SHAnnn:xxx smtp:ehlo 250-myhost.test.ex Hello localhost [127.0.0.1]\n250-SIZE 52428800\n250-LIMITS MAILMAX=1000 RCPTMAX=50000\n250-8BITMIME\n250-PIPELINING\n250 HELP
1999-03-02 09:44:33 10HmaY-000000005vi-0000 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
1999-03-02 09:44:33 10HmaY-000000005vi-0000 ver: TLS1.x
1999-03-02 09:44:33 10HmaY-000000005vi-0000 => good@??? R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-000000005vi-0000"
diff --git a/test/scripts/0000-Basic/0035 b/test/scripts/0000-Basic/0035
index 147c8e7e2..3894de6fe 100644
--- a/test/scripts/0000-Basic/0035
+++ b/test/scripts/0000-Basic/0035
@@ -7,10 +7,11 @@ client 127.0.0.1 PORT_D
??? 220
ehlo rhu.barb
??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
+??? 250-SIZE
+??? 250-LIMITS
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250 HELP
mail from:<notsubmit@y>
??? 250
rcpt to:<x@y>
@@ -68,6 +69,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<a@y>
??? 250
@@ -93,6 +95,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<a@y>
??? 250
diff --git a/test/scripts/0000-Basic/0159 b/test/scripts/0000-Basic/0159
index b30ca90d6..252e85c9b 100644
--- a/test/scripts/0000-Basic/0159
+++ b/test/scripts/0000-Basic/0159
@@ -12,6 +12,7 @@ ehlo [HOSTIPV4]
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<>
??? 250
@@ -29,6 +30,7 @@ ehlo [IPV4:HOSTIPV4]
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<>
??? 250
@@ -46,6 +48,7 @@ ehlo HOSTIPV4
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<>
??? 250
@@ -63,6 +66,7 @@ ehlo [V4NET.1.2.3]
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<>
??? 250
diff --git a/test/scripts/0000-Basic/0282 b/test/scripts/0000-Basic/0282
index d19464e12..8015586ac 100644
--- a/test/scripts/0000-Basic/0282
+++ b/test/scripts/0000-Basic/0282
@@ -10,6 +10,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
@@ -30,6 +31,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
diff --git a/test/scripts/0000-Basic/0287 b/test/scripts/0000-Basic/0287
index 9aa9f52e2..8a260794e 100644
--- a/test/scripts/0000-Basic/0287
+++ b/test/scripts/0000-Basic/0287
@@ -7,11 +7,12 @@ client 127.0.0.1 PORT_D
??? 220
ehlo rhu.barb
??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250-
-??? 250
+??? 250-SIZE
+??? 250-LIMITS
+??? 250-8BITMIME
+??? 250-ETRN
+??? 250-PIPELINING
+??? 250 HELP
ETRN one
??? 250
ETRN one
diff --git a/test/scripts/0000-Basic/0300 b/test/scripts/0000-Basic/0300
index 920f12b5d..abc8fd14c 100644
--- a/test/scripts/0000-Basic/0300
+++ b/test/scripts/0000-Basic/0300
@@ -18,6 +18,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
rset\r\nmail from:<userx@???>\r\nrcpt to:<userx@???>\r\ndata
??? 250
@@ -49,6 +50,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>\r\nrcpt to:<userx@???>
??? 554
@@ -69,6 +71,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
rset\r\nquit
??? 250
@@ -81,6 +84,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
rset\r\nquit
??? 554
@@ -93,6 +97,7 @@ ehlo dis.able
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>\r\nrcpt to:<userx@???>\r\ndata\r\nthe message\r\nsecond line
.
diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index 45a824285..d7a57c330 100644
--- a/test/scripts/0000-Basic/0301
+++ b/test/scripts/0000-Basic/0301
@@ -11,6 +11,7 @@ ehlo abcd\r\nmail from:<userx@???>
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
??? 250
quit
@@ -23,6 +24,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>\r\nrcpt to:<userx@???>\r\ndata
??? 250
@@ -47,6 +49,7 @@ ehlo en.force
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>\r\nrcpt to:<userx@???>\r\ndata\r\nthe message
.
diff --git a/test/scripts/0000-Basic/0458 b/test/scripts/0000-Basic/0458
index 062dec500..6e55ba08f 100644
--- a/test/scripts/0000-Basic/0458
+++ b/test/scripts/0000-Basic/0458
@@ -10,6 +10,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
@@ -44,6 +45,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<deny@???>
??? 550
@@ -78,6 +80,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
@@ -120,6 +123,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
rcpt to:<userx@???>
??? 503
diff --git a/test/scripts/0000-Basic/0460 b/test/scripts/0000-Basic/0460
index 953641b10..014871c06 100644
--- a/test/scripts/0000-Basic/0460
+++ b/test/scripts/0000-Basic/0460
@@ -10,6 +10,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
diff --git a/test/scripts/0000-Basic/0502 b/test/scripts/0000-Basic/0502
index 1c0bc6afc..e51ac277d 100644
--- a/test/scripts/0000-Basic/0502
+++ b/test/scripts/0000-Basic/0502
@@ -36,6 +36,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250 HELP
QUIT
??? 221
diff --git a/test/scripts/0000-Basic/0547 b/test/scripts/0000-Basic/0547
index a645802a1..df409eac2 100644
--- a/test/scripts/0000-Basic/0547
+++ b/test/scripts/0000-Basic/0547
@@ -19,6 +19,7 @@ client 127.0.0.1 PORT_D
ehlo x.y.z
??? 250
??? 250
+??? 250-
??? 250
??? 250
??? 250
@@ -33,6 +34,7 @@ ehlo x.y.z
??? 250
??? 250
??? 250
+??? 250-
??? 250
??? 250
MAIL FROM:<>
diff --git a/test/scripts/0000-Basic/0549 b/test/scripts/0000-Basic/0549
index 4126ae73f..5eda56613 100644
--- a/test/scripts/0000-Basic/0549
+++ b/test/scripts/0000-Basic/0549
@@ -9,6 +9,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
quit
??? 221
@@ -20,6 +21,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
quit
??? 221
diff --git a/test/scripts/0000-Basic/0556 b/test/scripts/0000-Basic/0556
index 2283c69b0..fead086d4 100644
--- a/test/scripts/0000-Basic/0556
+++ b/test/scripts/0000-Basic/0556
@@ -14,6 +14,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
rset\r\nmail from:<userx@???>\r\nrcpt to:<userx@???>\r\ndata
+++ 1
@@ -35,6 +36,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
+++ 1
@@ -47,6 +49,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559
index 7ebc64d34..8a68c708c 100644
--- a/test/scripts/0000-Basic/0559
+++ b/test/scripts/0000-Basic/0559
@@ -10,6 +10,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>\r\nrcpt to:<userx@???>\r\ndata
??? 250
diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562
index b829dff30..9b089681e 100644
--- a/test/scripts/0000-Basic/0562
+++ b/test/scripts/0000-Basic/0562
@@ -10,6 +10,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>\r\nrcpt to:<userx@???>\r\ndata
??? 250
@@ -56,6 +57,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>\r\nrcpt to:<userx@???>\r\ndata
??? 250
diff --git a/test/scripts/0000-Basic/0579 b/test/scripts/0000-Basic/0579
index 7a5f3ff6f..5c50c8a85 100644
--- a/test/scripts/0000-Basic/0579
+++ b/test/scripts/0000-Basic/0579
@@ -10,6 +10,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250 HELP
MAIL FROM:<>
??? 250
diff --git a/test/scripts/0000-Basic/0581 b/test/scripts/0000-Basic/0581
index a2053a8d4..1253ddd27 100644
--- a/test/scripts/0000-Basic/0581
+++ b/test/scripts/0000-Basic/0581
@@ -29,6 +29,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<userc@???>
??? 250
@@ -77,6 +78,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<usere@???>
??? 250
@@ -139,6 +141,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<userc@???>
??? 250
@@ -205,6 +208,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<userc@???>
??? 250
@@ -254,6 +258,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<userc@???>
??? 250
diff --git a/test/scripts/0000-Basic/0583 b/test/scripts/0000-Basic/0583
index 8cea367eb..cb5d18926 100644
--- a/test/scripts/0000-Basic/0583
+++ b/test/scripts/0000-Basic/0583
@@ -7,6 +7,7 @@ client 127.0.0.1 PORT_D
EHLO test
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250 HELP
diff --git a/test/scripts/0000-Basic/0612 b/test/scripts/0000-Basic/0612
index c5e3bfba1..f9f283dcb 100644
--- a/test/scripts/0000-Basic/0612
+++ b/test/scripts/0000-Basic/0612
@@ -8,6 +8,7 @@ client 127.0.0.1 PORT_D
EHLO testclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250 HELP
****
killdaemon
@@ -23,6 +24,7 @@ client HOSTIPV4 PORT_D
EHLO testclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-DSN
??? 250 HELP
MAIL FROM:<a@???>
@@ -50,6 +52,7 @@ client HOSTIPV4 PORT_D
EHLO testclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-DSN
??? 250 HELP
MAIL FROM:<b@???>
@@ -84,6 +87,7 @@ client HOSTIPV4 PORT_D
EHLO testclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-DSN
??? 250 HELP
MAIL FROM:<b2@???>
@@ -121,6 +125,7 @@ client HOSTIPV4 PORT_D
EHLO testclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-DSN
??? 250 HELP
MAIL FROM:<c@???>
@@ -146,6 +151,7 @@ client HOSTIPV4 PORT_D
EHLO testclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-DSN
??? 250 HELP
MAIL FROM:<d@???>
@@ -186,6 +192,7 @@ client HOSTIPV4 PORT_D
EHLO testclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-DSN
??? 250 HELP
MAIL FROM:<e@???>
diff --git a/test/scripts/0000-Basic/0628 b/test/scripts/0000-Basic/0628
index 3748e075f..1c76f0735 100644
--- a/test/scripts/0000-Basic/0628
+++ b/test/scripts/0000-Basic/0628
@@ -12,6 +12,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<tester@???>
??? 250
@@ -41,6 +42,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<tester2@???>
??? 250
diff --git a/test/scripts/0000-Basic/0629 b/test/scripts/0000-Basic/0629
index 8ca41aeae..14a3f9ce6 100644
--- a/test/scripts/0000-Basic/0629
+++ b/test/scripts/0000-Basic/0629
@@ -10,6 +10,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<test_2@paniclogrcpt>
??? 250
diff --git a/test/scripts/0000-Basic/0630 b/test/scripts/0000-Basic/0630
index fff689051..7228d94c4 100644
--- a/test/scripts/0000-Basic/0630
+++ b/test/scripts/0000-Basic/0630
@@ -10,6 +10,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<test_3@paniclogrouter>
??? 250
diff --git a/test/scripts/0000-Basic/0631 b/test/scripts/0000-Basic/0631
index 32d6dc0fc..1adb80971 100644
--- a/test/scripts/0000-Basic/0631
+++ b/test/scripts/0000-Basic/0631
@@ -10,6 +10,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<test_3@paniclogrouter>
??? 250
diff --git a/test/scripts/0000-Basic/0908 b/test/scripts/0000-Basic/0908
index 18ab5bb54..677b8e10a 100644
--- a/test/scripts/0000-Basic/0908
+++ b/test/scripts/0000-Basic/0908
@@ -12,6 +12,7 @@ EHLO test.com
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<sender@dom>
??? 250
diff --git a/test/scripts/1000-Basic-ipv6/1001 b/test/scripts/1000-Basic-ipv6/1001
index d0a71a6cd..3170647e2 100644
--- a/test/scripts/1000-Basic-ipv6/1001
+++ b/test/scripts/1000-Basic-ipv6/1001
@@ -12,6 +12,7 @@ ehlo [HOSTIPV6]
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<>
??? 250
@@ -29,6 +30,7 @@ ehlo [IPV6:HOSTIPV6]
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<>
??? 250
@@ -46,6 +48,7 @@ ehlo [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062]
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<>
??? 250
diff --git a/test/scripts/1100-Basic-TLS/1103 b/test/scripts/1100-Basic-TLS/1103
index 734780f4d..5d0907e21 100644
--- a/test/scripts/1100-Basic-TLS/1103
+++ b/test/scripts/1100-Basic-TLS/1103
@@ -10,6 +10,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -18,6 +19,7 @@ ehlo test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
@@ -34,6 +36,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/1100-Basic-TLS/1104 b/test/scripts/1100-Basic-TLS/1104
index 4a3af17ee..ec4e08997 100644
--- a/test/scripts/1100-Basic-TLS/1104
+++ b/test/scripts/1100-Basic-TLS/1104
@@ -10,6 +10,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
@@ -26,6 +27,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
diff --git a/test/scripts/1100-Basic-TLS/1105 b/test/scripts/1100-Basic-TLS/1105
index 01f911329..76387c1a9 100644
--- a/test/scripts/1100-Basic-TLS/1105
+++ b/test/scripts/1100-Basic-TLS/1105
@@ -16,6 +16,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -24,6 +25,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
diff --git a/test/scripts/1100-Basic-TLS/1106 b/test/scripts/1100-Basic-TLS/1106
index 1b8438f7e..14a0fd794 100644
--- a/test/scripts/1100-Basic-TLS/1106
+++ b/test/scripts/1100-Basic-TLS/1106
@@ -10,6 +10,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/1100-Basic-TLS/1107 b/test/scripts/1100-Basic-TLS/1107
index 79d412d70..e1459242b 100644
--- a/test/scripts/1100-Basic-TLS/1107
+++ b/test/scripts/1100-Basic-TLS/1107
@@ -10,6 +10,7 @@ ehlo timeout.rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls_wait
??? 220
@@ -24,6 +25,7 @@ ehlo close.rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls_wait
??? 220
diff --git a/test/scripts/1100-Basic-TLS/1108 b/test/scripts/1100-Basic-TLS/1108
index 4e85dc586..8f5caf82f 100644
--- a/test/scripts/1100-Basic-TLS/1108
+++ b/test/scripts/1100-Basic-TLS/1108
@@ -10,6 +10,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -18,6 +19,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
@@ -39,6 +41,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
diff --git a/test/scripts/1100-Basic-TLS/1110 b/test/scripts/1100-Basic-TLS/1110
index f81b7d8c7..2fb331e6b 100644
--- a/test/scripts/1100-Basic-TLS/1110
+++ b/test/scripts/1100-Basic-TLS/1110
@@ -9,6 +9,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<userx@???>
??? 250
diff --git a/test/scripts/1100-Basic-TLS/1111 b/test/scripts/1100-Basic-TLS/1111
index f36360d8f..3decc0c8b 100644
--- a/test/scripts/1100-Basic-TLS/1111
+++ b/test/scripts/1100-Basic-TLS/1111
@@ -10,6 +10,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/1100-Basic-TLS/1112 b/test/scripts/1100-Basic-TLS/1112
index 396ee3fef..8554ea25f 100644
--- a/test/scripts/1100-Basic-TLS/1112
+++ b/test/scripts/1100-Basic-TLS/1112
@@ -12,6 +12,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -25,6 +26,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
quit
??? 221
diff --git a/test/scripts/1190-TLS-ALPN/1190 b/test/scripts/1190-TLS-ALPN/1190
index bd873c391..ddb6dd097 100644
--- a/test/scripts/1190-TLS-ALPN/1190
+++ b/test/scripts/1190-TLS-ALPN/1190
@@ -38,6 +38,7 @@ client 127.0.0.1 PORT_D
EHLO IOTtester
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
diff --git a/test/scripts/2000-GnuTLS/2002 b/test/scripts/2000-GnuTLS/2002
index 2cf6b3329..cdaf56d68 100644
--- a/test/scripts/2000-GnuTLS/2002
+++ b/test/scripts/2000-GnuTLS/2002
@@ -21,6 +21,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -29,6 +30,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<CALLER@???>
??? 250
@@ -50,6 +52,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -74,6 +77,7 @@ client-gnutls -p NONE:+SIGN-RSA-SHA256:+SIGN-ECDSA-SHA512:+VERS-TLS1.2:+ECDHE-RS
ehlo rhu.barb
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -99,6 +103,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -131,6 +136,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -160,6 +166,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014
index 6ecfeccfc..5fdb361ce 100644
--- a/test/scripts/2000-GnuTLS/2014
+++ b/test/scripts/2000-GnuTLS/2014
@@ -12,6 +12,7 @@ ehlo rhu1.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -27,6 +28,7 @@ ehlo rhu2.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -48,6 +50,7 @@ ehlo rhu3.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -69,6 +72,7 @@ ehlo rhu4.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -92,6 +96,7 @@ ehlo rhu5.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -108,6 +113,7 @@ ehlo rhu6.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -144,6 +150,7 @@ ehlo rhu7.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -161,6 +168,7 @@ ehlo rhu8.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -182,6 +190,7 @@ ehlo rhu9.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/2000-GnuTLS/2024 b/test/scripts/2000-GnuTLS/2024
index 307fde706..33448738c 100644
--- a/test/scripts/2000-GnuTLS/2024
+++ b/test/scripts/2000-GnuTLS/2024
@@ -17,6 +17,7 @@ ehlo rhu1.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -36,6 +37,7 @@ ehlo rhu2.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 454
diff --git a/test/scripts/2000-GnuTLS/2029 b/test/scripts/2000-GnuTLS/2029
index bc59e220d..19ab63183 100644
--- a/test/scripts/2000-GnuTLS/2029
+++ b/test/scripts/2000-GnuTLS/2029
@@ -14,6 +14,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/2000-GnuTLS/2034 b/test/scripts/2000-GnuTLS/2034
index c8654f1aa..8278c436b 100644
--- a/test/scripts/2000-GnuTLS/2034
+++ b/test/scripts/2000-GnuTLS/2034
@@ -11,6 +11,7 @@ ehlo rhu1.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -26,6 +27,7 @@ ehlo rhu2.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/2000-GnuTLS/2036 b/test/scripts/2000-GnuTLS/2036
index cd6e9a121..b16b082d7 100644
--- a/test/scripts/2000-GnuTLS/2036
+++ b/test/scripts/2000-GnuTLS/2036
@@ -17,6 +17,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<userc@???>
??? 250
@@ -50,6 +51,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<usere@???>
??? 250
diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index 290db16f8..baebe5eb1 100644
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -19,6 +19,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -27,6 +28,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<a@???>
??? 250
@@ -48,6 +50,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -56,6 +59,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<"name with spaces"@???>
??? 250
@@ -78,6 +82,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220 TLS go ahead
@@ -93,6 +98,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -101,6 +107,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<b@???>
??? 250
@@ -130,6 +137,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -138,6 +146,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
mail from:<c@???>
??? 250
diff --git a/test/scripts/2100-OpenSSL/2114 b/test/scripts/2100-OpenSSL/2114
index b5245fd37..8d2b17445 100644
--- a/test/scripts/2100-OpenSSL/2114
+++ b/test/scripts/2100-OpenSSL/2114
@@ -10,6 +10,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -31,6 +32,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -52,6 +54,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -73,6 +76,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -94,6 +98,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -111,6 +116,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -139,6 +145,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -156,6 +163,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -177,6 +185,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/2100-OpenSSL/2124 b/test/scripts/2100-OpenSSL/2124
index 6649ed968..dd5994008 100644
--- a/test/scripts/2100-OpenSSL/2124
+++ b/test/scripts/2100-OpenSSL/2124
@@ -9,6 +9,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -28,6 +29,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 454
diff --git a/test/scripts/2100-OpenSSL/2132 b/test/scripts/2100-OpenSSL/2132
index 9aa4c1a8c..ec0ccc6f8 100644
--- a/test/scripts/2100-OpenSSL/2132
+++ b/test/scripts/2100-OpenSSL/2132
@@ -11,6 +11,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -37,6 +38,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -63,6 +65,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -80,6 +83,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/2100-OpenSSL/2136 b/test/scripts/2100-OpenSSL/2136
index 396075cc1..e8d4d3261 100644
--- a/test/scripts/2100-OpenSSL/2136
+++ b/test/scripts/2100-OpenSSL/2136
@@ -16,6 +16,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<userc@???>
??? 250
@@ -49,6 +50,7 @@ EHLO test.ex
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<usere@???>
??? 250
diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150
index 162436e29..c25aad854 100644
--- a/test/scripts/2100-OpenSSL/2150
+++ b/test/scripts/2100-OpenSSL/2150
@@ -12,6 +12,7 @@ ehlo abcd
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/3400-plaintext/3415 b/test/scripts/3400-plaintext/3415
index d5bcc33be..590a55c96 100644
--- a/test/scripts/3400-plaintext/3415
+++ b/test/scripts/3400-plaintext/3415
@@ -11,6 +11,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJuYW1lAG15c2VjcmV0
??? 235
@@ -46,6 +47,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJuYW1lAG15c2VjcmV0
??? 235
@@ -73,6 +75,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJuYW1lAG15c2VjcmV0
??? 235
@@ -100,6 +103,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJuYW1lAG15c2VjcmV0
??? 235
diff --git a/test/scripts/3450-plaintext-GnuTLS/3450 b/test/scripts/3450-plaintext-GnuTLS/3450
index d18387eb4..5f7d23bde 100644
--- a/test/scripts/3450-plaintext-GnuTLS/3450
+++ b/test/scripts/3450-plaintext-GnuTLS/3450
@@ -11,6 +11,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJ4AHNlY3JldA==
??? 235
@@ -26,6 +27,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJ4AHNlY3JldA==
??? 503
@@ -37,6 +39,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJ4AHNlY3JldA==
??? 235
diff --git a/test/scripts/3450-plaintext-GnuTLS/3453 b/test/scripts/3450-plaintext-GnuTLS/3453
index a88f49f3d..27c56b7fc 100644
--- a/test/scripts/3450-plaintext-GnuTLS/3453
+++ b/test/scripts/3450-plaintext-GnuTLS/3453
@@ -11,6 +11,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -33,6 +34,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/3450-plaintext-GnuTLS/3454 b/test/scripts/3450-plaintext-GnuTLS/3454
index c867ef540..a417f3bb3 100644
--- a/test/scripts/3450-plaintext-GnuTLS/3454
+++ b/test/scripts/3450-plaintext-GnuTLS/3454
@@ -7,6 +7,7 @@ client-gnutls 127.0.0.1 PORT_D
ehlo foobar
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-AUTH
@@ -22,6 +23,7 @@ client-gnutls 127.0.0.1 PORT_D
ehlo foobar
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-AUTH
@@ -32,6 +34,7 @@ starttls
ehlo foobar
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-AUTH
diff --git a/test/scripts/3460-plaintext-OpenSSL/3460 b/test/scripts/3460-plaintext-OpenSSL/3460
index 98c7219cd..c06ddc83b 100644
--- a/test/scripts/3460-plaintext-OpenSSL/3460
+++ b/test/scripts/3460-plaintext-OpenSSL/3460
@@ -10,6 +10,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJ4AHNlY3JldA==
??? 235
@@ -25,6 +26,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJ4AHNlY3JldA==
??? 503
@@ -36,6 +38,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJ4AHNlY3JldA==
??? 235
diff --git a/test/scripts/3460-plaintext-OpenSSL/3463 b/test/scripts/3460-plaintext-OpenSSL/3463
index dd83449a9..8e4843e4f 100644
--- a/test/scripts/3460-plaintext-OpenSSL/3463
+++ b/test/scripts/3460-plaintext-OpenSSL/3463
@@ -10,6 +10,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -32,6 +33,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
diff --git a/test/scripts/3460-plaintext-OpenSSL/3464 b/test/scripts/3460-plaintext-OpenSSL/3464
index 997ae3056..6ec446234 100644
--- a/test/scripts/3460-plaintext-OpenSSL/3464
+++ b/test/scripts/3460-plaintext-OpenSSL/3464
@@ -10,6 +10,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -25,6 +26,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -34,6 +36,7 @@ ehlo foobar
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
auth plain AHVzZXJ4AHNlY3JldA==
??? 235
diff --git a/test/scripts/3600-SPA/3600 b/test/scripts/3600-SPA/3600
index 9f4f38941..78b7bd3a3 100644
--- a/test/scripts/3600-SPA/3600
+++ b/test/scripts/3600-SPA/3600
@@ -17,6 +17,7 @@ EHLO xxxx
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
AUTH NTLM
??? 334
@@ -33,6 +34,7 @@ EHLO xxxx
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
AUTH NTLM
??? 334
diff --git a/test/scripts/3720-external-auth-GnuTLS/3720 b/test/scripts/3720-external-auth-GnuTLS/3720
index 1b932e69b..af0ad7963 100644
--- a/test/scripts/3720-external-auth-GnuTLS/3720
+++ b/test/scripts/3720-external-auth-GnuTLS/3720
@@ -12,6 +12,7 @@ EHLO tester
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-STARTTLS
??? 250 HELP
STARTTLS
@@ -21,6 +22,7 @@ EHLO tester
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-AUTH EXTERNAL
??? 250 HELP
AUTH EXTERNAL c2VydmVyMi5leGFtcGxlLm9yZw==
diff --git a/test/scripts/3721-external-auth-OpenSSL/3721 b/test/scripts/3721-external-auth-OpenSSL/3721
index 35cc11bd4..32ea8f4da 100644
--- a/test/scripts/3721-external-auth-OpenSSL/3721
+++ b/test/scripts/3721-external-auth-OpenSSL/3721
@@ -12,6 +12,7 @@ EHLO tester
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-STARTTLS
??? 250 HELP
STARTTLS
@@ -21,6 +22,7 @@ EHLO tester
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-AUTH EXTERNAL
??? 250 HELP
AUTH EXTERNAL c2VydmVyMi5leGFtcGxlLm9yZw==
diff --git a/test/scripts/3800-Cyrus-SASL/3800 b/test/scripts/3800-Cyrus-SASL/3800
index a033ea0c6..9c44f5f2c 100644
--- a/test/scripts/3800-Cyrus-SASL/3800
+++ b/test/scripts/3800-Cyrus-SASL/3800
@@ -9,6 +9,7 @@ EHLO xxxx
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
AUTH PLAIN AHBoMTAAc2VjcmV0
??? 535
diff --git a/test/scripts/3820-Gnu-SASL/3820 b/test/scripts/3820-Gnu-SASL/3820
index 83ade6316..8ac1b5099 100644
--- a/test/scripts/3820-Gnu-SASL/3820
+++ b/test/scripts/3820-Gnu-SASL/3820
@@ -14,6 +14,7 @@ EHLO xxxx
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
AUTH PLAIN AHBoMTAAc2VjcmV0
??? 535
diff --git a/test/scripts/4032-xclient/4032 b/test/scripts/4032-xclient/4032
index fa0d0b8c3..2b78b909a 100644
--- a/test/scripts/4032-xclient/4032
+++ b/test/scripts/4032-xclient/4032
@@ -11,6 +11,7 @@ client 127.0.0.1 PORT_D
EHLO plainclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250 HELP
@@ -37,6 +38,7 @@ client HOSTIPV4 PORT_D
EHLO xclientproxy
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
@@ -46,6 +48,7 @@ XCLIENT NAME=proxylookedupname.net ADDR=127.0.0.2 PORT=4242 DESTADDR=10.42.42.42
EHLO clienthelo
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
@@ -66,6 +69,7 @@ XCLIENT NAME=[TEMPUNAVAIL] ADDR=127.0.0.3 PORT=4243 LOGIN=[UNAVAILABLE]
EHLO anotherhelo
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
@@ -101,6 +105,7 @@ client HOSTIPV4 PORT_D
EHLO xclientproxy
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
@@ -123,6 +128,7 @@ client HOSTIPV4 PORT_D
EHLO xclientproxy
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
diff --git a/test/scripts/4034-xclient-tls/4034 b/test/scripts/4034-xclient-tls/4034
index fa58c7eeb..9cc6f84a0 100644
--- a/test/scripts/4034-xclient-tls/4034
+++ b/test/scripts/4034-xclient-tls/4034
@@ -11,6 +11,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO plainclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -20,6 +21,7 @@ STARTTLS
EHLO plainclient
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250 HELP
@@ -46,6 +48,7 @@ client-anytls HOSTIPV4 PORT_D
EHLO xclientproxy
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -56,6 +59,7 @@ STARTTLS
EHLO xclientproxy
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
@@ -65,6 +69,7 @@ XCLIENT NAME=proxylookedupname.net ADDR=127.0.0.2 PORT=4242 DESTADDR=10.42.42.42
EHLO clienthelo
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
@@ -85,6 +90,7 @@ XCLIENT NAME=[TEMPUNAVAIL] ADDR=127.0.0.3 PORT=4243 LOGIN=[UNAVAILABLE]
EHLO anotherhelo
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
@@ -120,6 +126,7 @@ client-anytls HOSTIPV4 PORT_D
EHLO xclientproxy
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -130,6 +137,7 @@ STARTTLS
EHLO xclientproxy
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
@@ -152,6 +160,7 @@ client-anytls HOSTIPV4 PORT_D
EHLO xclientproxy
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -162,6 +171,7 @@ STARTTLS
EHLO xclientproxy
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-XCLIENT
diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index 5a591fdea..27a977552 100644
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -11,6 +11,7 @@ client 127.0.0.1 PORT_D
EHLO client
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-SMTPUTF8
@@ -37,6 +38,7 @@ client 127.0.0.1 PORT_D
EHLO client
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-SMTPUTF8
@@ -94,6 +96,7 @@ client 127.0.0.1 PORT_D
EHLO client
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250 HELP
diff --git a/test/scripts/4210-GnuTLS-International/4211 b/test/scripts/4210-GnuTLS-International/4211
index 8fa9fd3bc..526ff6ea8 100644
--- a/test/scripts/4210-GnuTLS-International/4211
+++ b/test/scripts/4210-GnuTLS-International/4211
@@ -12,6 +12,7 @@ client 127.0.0.1 PORT_D
EHLO client
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -39,6 +40,7 @@ client 127.0.0.1 PORT_D
EHLO client
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
diff --git a/test/scripts/4220-OpenSSL-International/4221 b/test/scripts/4220-OpenSSL-International/4221
index 6146d8b3b..3833b8045 100644
--- a/test/scripts/4220-OpenSSL-International/4221
+++ b/test/scripts/4220-OpenSSL-International/4221
@@ -11,6 +11,7 @@ client 127.0.0.1 PORT_D
EHLO client
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -38,6 +39,7 @@ client 127.0.0.1 PORT_D
EHLO client
??? 250-
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
diff --git a/test/scripts/4500-DKIM/4519 b/test/scripts/4500-DKIM/4519
index fb98e5564..9996f3915 100644
--- a/test/scripts/4500-DKIM/4519
+++ b/test/scripts/4500-DKIM/4519
@@ -13,6 +13,7 @@ EHLO xxx
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<CALLER@???>
??? 250
@@ -43,6 +44,7 @@ EHLO xxx
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
MAIL FROM:<CALLER@???>
??? 250
diff --git a/test/scripts/4520-TLS-DKIM/4520 b/test/scripts/4520-TLS-DKIM/4520
index 665fd909b..ec40c28fe 100644
--- a/test/scripts/4520-TLS-DKIM/4520
+++ b/test/scripts/4520-TLS-DKIM/4520
@@ -12,6 +12,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -57,6 +58,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -98,6 +100,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -142,6 +145,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -189,6 +193,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -239,6 +244,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
diff --git a/test/scripts/4520-TLS-DKIM/4521 b/test/scripts/4520-TLS-DKIM/4521
index da17c30a1..d4d74c902 100644
--- a/test/scripts/4520-TLS-DKIM/4521
+++ b/test/scripts/4520-TLS-DKIM/4521
@@ -14,6 +14,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -57,6 +58,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
diff --git a/test/scripts/4520-TLS-DKIM/4522 b/test/scripts/4520-TLS-DKIM/4522
index e636930af..a0b1a33b9 100644
--- a/test/scripts/4520-TLS-DKIM/4522
+++ b/test/scripts/4520-TLS-DKIM/4522
@@ -14,6 +14,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -70,6 +71,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -120,6 +122,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -168,6 +171,7 @@ EHLO test
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
diff --git a/test/scripts/4520-TLS-DKIM/4523 b/test/scripts/4520-TLS-DKIM/4523
index 4d63cd107..16ba690ba 100644
--- a/test/scripts/4520-TLS-DKIM/4523
+++ b/test/scripts/4520-TLS-DKIM/4523
@@ -17,6 +17,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
diff --git a/test/scripts/4520-TLS-DKIM/4524 b/test/scripts/4520-TLS-DKIM/4524
index 7eabb37ad..5c5739da2 100644
--- a/test/scripts/4520-TLS-DKIM/4524
+++ b/test/scripts/4520-TLS-DKIM/4524
@@ -17,6 +17,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
diff --git a/test/scripts/4520-TLS-DKIM/4526 b/test/scripts/4520-TLS-DKIM/4526
index d687e22a7..ba56bbb1a 100644
--- a/test/scripts/4520-TLS-DKIM/4526
+++ b/test/scripts/4520-TLS-DKIM/4526
@@ -12,6 +12,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -51,6 +52,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -93,6 +95,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -136,6 +139,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -182,6 +186,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -223,6 +228,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -6304,6 +6310,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -6349,6 +6356,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
diff --git a/test/scripts/4520-TLS-DKIM/4528 b/test/scripts/4520-TLS-DKIM/4528
index 117535bae..450ecb1de 100644
--- a/test/scripts/4520-TLS-DKIM/4528
+++ b/test/scripts/4520-TLS-DKIM/4528
@@ -13,6 +13,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -58,6 +59,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -103,6 +105,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
@@ -148,6 +151,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
diff --git a/test/scripts/4520-TLS-DKIM/4529 b/test/scripts/4520-TLS-DKIM/4529
index 4be58fccd..3e14636ce 100644
--- a/test/scripts/4520-TLS-DKIM/4529
+++ b/test/scripts/4520-TLS-DKIM/4529
@@ -12,6 +12,7 @@ client-anytls 127.0.0.1 PORT_D
EHLO test
??? 250-myhost
??? 250-SIZE
+??? 250-LIMITS
??? 250-8BITMIME
??? 250-PIPELINING
??? 250-STARTTLS
diff --git a/test/scripts/4520-TLS-DKIM/4539 b/test/scripts/4520-TLS-DKIM/4539
index 93214275d..56309f515 100644
--- a/test/scripts/4520-TLS-DKIM/4539
+++ b/test/scripts/4520-TLS-DKIM/4539
@@ -14,6 +14,7 @@ EHLO xxx
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
@@ -50,6 +51,7 @@ EHLO xxx
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
STARTTLS
??? 220
diff --git a/test/scripts/4710-esmtp-limits/REQUIRES b/test/scripts/4710-esmtp-limits/REQUIRES
index 4817265b8..d2d4d21bf 100644
--- a/test/scripts/4710-esmtp-limits/REQUIRES
+++ b/test/scripts/4710-esmtp-limits/REQUIRES
@@ -1 +1 @@
-support Experimental_ESMTP_Limits
+support ESMTP_Limits
diff --git a/test/scripts/5500-PRDR/5500 b/test/scripts/5500-PRDR/5500
index 1c6c344fe..73aaa977c 100644
--- a/test/scripts/5500-PRDR/5500
+++ b/test/scripts/5500-PRDR/5500
@@ -13,6 +13,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-PRDR
??? 250
mail from:<> PRDR
@@ -46,6 +47,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-PRDR
??? 250
mail from:<> PRDR
@@ -77,6 +79,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-PRDR
??? 250
mail from:<> PRDR
@@ -101,6 +104,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-PRDR
??? 250
mail from:<> PRDR
@@ -130,6 +134,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-PRDR
??? 250
mail from:<> PRDR
@@ -159,6 +164,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250-PRDR
??? 250
mail from:<>
diff --git a/test/scripts/5600-OCSP-OpenSSL/5600 b/test/scripts/5600-OCSP-OpenSSL/5600
index d8ae8eabf..8c9939a05 100644
--- a/test/scripts/5600-OCSP-OpenSSL/5600
+++ b/test/scripts/5600-OCSP-OpenSSL/5600
@@ -17,6 +17,7 @@ ehlo rhu1.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -48,6 +49,7 @@ ehlo rhu2.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -73,6 +75,7 @@ ehlo rhu3.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -98,6 +101,7 @@ ehlo rhu4.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -106,6 +110,7 @@ ehlo rhu5.barb.tls
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
quit
****
diff --git a/test/scripts/5600-OCSP-OpenSSL/5610 b/test/scripts/5600-OCSP-OpenSSL/5610
index 73b13b4b9..6058daf54 100644
--- a/test/scripts/5600-OCSP-OpenSSL/5610
+++ b/test/scripts/5600-OCSP-OpenSSL/5610
@@ -17,6 +17,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -48,6 +49,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -73,6 +75,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -98,6 +101,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -106,6 +110,7 @@ ehlo rhu.barb.tls
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
quit
****
diff --git a/test/scripts/5650-OCSP-GnuTLS/5650 b/test/scripts/5650-OCSP-GnuTLS/5650
index ee4b4f028..e2259c7ed 100644
--- a/test/scripts/5650-OCSP-GnuTLS/5650
+++ b/test/scripts/5650-OCSP-GnuTLS/5650
@@ -18,6 +18,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -49,6 +50,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 454
@@ -76,6 +78,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 454
@@ -102,6 +105,7 @@ ehlo rhu.barb
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
starttls
??? 220
@@ -110,6 +114,7 @@ ehlo rhu.barb.tls
??? 250-
??? 250-
??? 250-
+??? 250-
??? 250
quit
****
diff --git a/test/stderr/0038 b/test/stderr/0038
index 204335401..f6b3ea23b 100644
--- a/test/stderr/0038
+++ b/test/stderr/0038
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -55,6 +57,8 @@ LOG: 10HmaX-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> list element: @
>>> list element: @[]
>>> test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -99,6 +103,8 @@ LOG: 10HmaY-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> list element: @
>>> list element: @[]
>>> test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -144,6 +150,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> list element: @
>>> list element: @[]
>>> test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -188,6 +196,8 @@ LOG: 10HmbA-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> list element: @
>>> list element: @[]
>>> test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -261,6 +271,8 @@ LOG: 10HmbB-000000005vi-0000 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA
>>> list element: @
>>> list element: @[]
>>> test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0043 b/test/stderr/0043
index 70b55e29e..083e26088 100644
--- a/test/stderr/0043
+++ b/test/stderr/0043
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0044 b/test/stderr/0044
index 90799b13a..47eb91f23 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -32,6 +32,8 @@ exim.test.ex in helo_lookup_domains? no (end of list)
sender_fullhost = (exim.test.ex) [V4NET.11.12.13]
sender_rcvhost = [V4NET.11.12.13] (helo=exim.test.ex)
set_process_info: pppp handling incoming connection from (exim.test.ex) [V4NET.11.12.13]
+ list element: *
+ host in limits_advertise_hosts? yes (matched "*")
host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts?
list element: *
@@ -40,6 +42,7 @@ host in chunking_advertise_hosts?
host in chunking_advertise_hosts? no (end of list)
SMTP>> 250-the.local.host.name Hello exim.test.ex [V4NET.11.12.13]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -183,6 +186,8 @@ search_tidyup called
>>> list element: @
>>> list element: @[]
>>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -248,6 +253,8 @@ exim.test.ex in helo_lookup_domains? no (end of list)
sender_fullhost = (exim.test.ex) [V4NET.99.99.99]
sender_rcvhost = [V4NET.99.99.99] (helo=exim.test.ex)
set_process_info: pppp handling incoming connection from (exim.test.ex) [V4NET.99.99.99]
+ list element: *
+ host in limits_advertise_hosts? yes (matched "*")
host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts?
list element: *
@@ -256,6 +263,7 @@ host in chunking_advertise_hosts?
host in chunking_advertise_hosts? no (end of list)
SMTP>> 250-the.local.host.name Hello exim.test.ex [V4NET.99.99.99]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/0070 b/test/stderr/0070
index 21208fd55..01c0798b4 100644
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -339,6 +339,8 @@ MUNGED: ::1 will be omitted in what follows
>>> list element: @
>>> list element: @[]
>>> rhubarb in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0079 b/test/stderr/0079
index 0ce7d257f..c1cf6ab8d 100644
--- a/test/stderr/0079
+++ b/test/stderr/0079
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0080 b/test/stderr/0080
index e69ce1df2..0bcfd2526 100644
--- a/test/stderr/0080
+++ b/test/stderr/0080
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0121 b/test/stderr/0121
index 283bb7111..40ba5f191 100644
--- a/test/stderr/0121
+++ b/test/stderr/0121
@@ -256,6 +256,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@???> temporarily
>>> list element: @
>>> list element: @[]
>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -269,6 +271,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@???> temporarily
>>> list element: @
>>> list element: @[]
>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -279,6 +283,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@???> temporarily
>>> list element: @
>>> list element: @[]
>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -289,6 +295,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@???> temporarily
>>> list element: @
>>> list element: @[]
>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -299,6 +307,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@???> temporarily
>>> list element: @
>>> list element: @[]
>>> foo.bar in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0138 b/test/stderr/0138
index 9bea4c4f1..d6e29087d 100644
--- a/test/stderr/0138
+++ b/test/stderr/0138
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -73,6 +75,8 @@ LOG: 10HmaX-000000005vi-0000 <= postmaster@??? H=(exim.test.ex) [V4NET.
>>> list element: @
>>> list element: @[]
>>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0180 b/test/stderr/0180
index 007e11063..9594566b8 100644
--- a/test/stderr/0180
+++ b/test/stderr/0180
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> some.host in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -28,6 +30,8 @@
>>> list element: @
>>> list element: @[]
>>> some.host in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0243 b/test/stderr/0243
index 00f5d0a85..3e3f2678b 100644
--- a/test/stderr/0243
+++ b/test/stderr/0243
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> xxxx in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0303 b/test/stderr/0303
index afd6bbbfa..60c8bba97 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -29,6 +29,8 @@
>>> IP address lookup yielded "ten-1.test.ex"
>>> checking addresses for ten-1.test.ex
>>> V4NET.0.0.1 OK
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -82,6 +84,8 @@ SMTP<< EHLO [V4NET.2.3.4]
sender_fullhost = ([V4NET.2.3.4]) [V4NET.2.3.4]
sender_rcvhost = [V4NET.2.3.4]
set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.2.3.4]
+ list element: *
+ host in limits_advertise_hosts? yes (matched "*")
host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts?
list element: *
@@ -90,6 +94,7 @@ host in chunking_advertise_hosts?
host in chunking_advertise_hosts? no (end of list)
SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -162,6 +167,8 @@ SMTP<< EHLO [V4NET.2.3.4]
sender_fullhost = host.name.tld [V4NET.2.3.4]
sender_rcvhost = host.name.tld ([V4NET.2.3.4])
set_process_info: pppp handling incoming connection from host.name.tld [V4NET.2.3.4]
+ list element: *
+ host in limits_advertise_hosts? yes (matched "*")
host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts?
list element: *
@@ -170,6 +177,7 @@ host in chunking_advertise_hosts?
host in chunking_advertise_hosts? no (end of list)
SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/0371 b/test/stderr/0371
index b57b68d8c..c1f96114f 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -38,6 +38,8 @@ something in helo_lookup_domains? no (end of list)
sender_fullhost = (something) [V4NET.0.0.0]
sender_rcvhost = [V4NET.0.0.0] (helo=something)
set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
+ list element: *
+ host in limits_advertise_hosts? yes (matched "*")
host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts?
list element: *
@@ -46,6 +48,7 @@ host in chunking_advertise_hosts?
host in chunking_advertise_hosts? no (end of list)
SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-VRFY
250-PIPELINING
diff --git a/test/stderr/0384 b/test/stderr/0384
index 048215ec7..747d2bdc6 100644
--- a/test/stderr/0384
+++ b/test/stderr/0384
@@ -13,6 +13,8 @@
>>> [V4NET.9.8.7] in helo_lookup_domains? no (end of list)
>>> verifying EHLO/HELO argument "[V4NET.9.8.7]"
>>> matched host address
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0487 b/test/stderr/0487
index 666933d1c..e703c88d9 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -19,6 +19,8 @@ LOG: smtp_connection MAIN
SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered
SMTP<< ehlo x.y
+ list element: *
+ in limits_advertise_hosts? yes (matched "*")
in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts?
list element: *
@@ -27,6 +29,7 @@ SMTP<< ehlo x.y
in chunking_advertise_hosts? no (end of list)
SMTP>> 250-myhost.test.ex Hello CALLER at x.y
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/0513 b/test/stderr/0513
index ac63399e7..12280cded 100644
--- a/test/stderr/0513
+++ b/test/stderr/0513
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> a.b.c.d in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0524 b/test/stderr/0524
index f515c0622..2212a1b46 100644
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> csa1.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -29,6 +31,8 @@
>>> list element: @
>>> list element: @[]
>>> csa2.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -54,6 +58,8 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
>>> list element: @
>>> list element: @[]
>>> csa1.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -74,6 +80,8 @@ LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization
>>> list element: @
>>> list element: @[]
>>> csa2.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0537 b/test/stderr/0537
index 21c744c9e..5142edde8 100644
--- a/test/stderr/0537
+++ b/test/stderr/0537
@@ -86,6 +86,8 @@ LOG: sender_ident=ident
>>> end of ACL "log": ACCEPT
>>> accept: condition test succeeded in ACL "connect"
>>> end of ACL "connect": ACCEPT
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/0634 b/test/stderr/0634
index 5e4fbe08e..bb6334468 100644
--- a/test/stderr/0634
+++ b/test/stderr/0634
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> test1 in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -35,6 +37,8 @@
>>> list element: @
>>> list element: @[]
>>> test2 in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -60,6 +64,8 @@
>>> list element: @
>>> list element: @[]
>>> test3 in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/1150 b/test/stderr/1150
index 1640aa020..4345670f9 100644
--- a/test/stderr/1150
+++ b/test/stderr/1150
@@ -6,6 +6,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -15,6 +16,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -41,6 +43,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -50,6 +53,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -77,6 +81,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected
SMTP>> EHLO myhost.test.ex
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -86,6 +91,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected
SMTP>> EHLO myhost.test.ex
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/1157 b/test/stderr/1157
index 9eaf21d0a..aeb2273ec 100644
--- a/test/stderr/1157
+++ b/test/stderr/1157
@@ -13,6 +13,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -24,6 +25,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -107,6 +109,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -118,6 +121,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -201,6 +205,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -212,6 +217,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -228,6 +234,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -251,6 +258,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -267,6 +275,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -290,6 +299,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/1160 b/test/stderr/1160
index 7a2a1aee5..5683ab0d7 100644
--- a/test/stderr/1160
+++ b/test/stderr/1160
@@ -6,6 +6,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -32,6 +33,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
SMTP>> EHLO helo.data.changed
SMTP<< 250-myhost.test.ex Hello helo.data.changed [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -59,6 +61,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected
SMTP>> EHLO myhost.test.ex
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/2035 b/test/stderr/2035
index e0085fb16..66f4d48b6 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -9,6 +9,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -20,6 +21,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/2135 b/test/stderr/2135
index e0085fb16..66f4d48b6 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -9,6 +9,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -20,6 +21,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/3000 b/test/stderr/3000
index 137ca11ef..69915e2d1 100644
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -80,6 +80,8 @@ LOG: smtp_connection MAIN
>>> list element: @
>>> list element: @[]
>>> x.y.z in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/3208 b/test/stderr/3208
index 65f28b8fc..441efed4f 100644
--- a/test/stderr/3208
+++ b/test/stderr/3208
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> remote.host in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/3400 b/test/stderr/3400
index 9d7bfaabd..c8b9ba1e2 100644
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -120,6 +120,8 @@ LOG: H=(test) [10.0.0.2] Warning: accepted ETRN #abcd
>>> list element: @
>>> list element: @[]
>>> test.host in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -416,6 +418,8 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd
>>> list element: @
>>> list element: @[]
>>> test.host in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -567,6 +571,8 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@???> rejected RCPT <userx@cu
>>> list element: @
>>> list element: @[]
>>> test.host in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -632,6 +638,8 @@ testing.testing in helo_lookup_domains? no (end of list)
sender_fullhost = (testing.testing) [10.0.0.5]
sender_rcvhost = [10.0.0.5] (helo=testing.testing ident=CALLER)
set_process_info: pppp handling incoming connection from (testing.testing) [10.0.0.5] U=CALLER
+ list element: *
+ host in limits_advertise_hosts? yes (matched "*")
host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts?
list element: *
@@ -669,6 +677,7 @@ host in chunking_advertise_hosts?
host in chunking_advertise_hosts? no (end of list)
SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
diff --git a/test/stderr/3408 b/test/stderr/3408
index 0dce33e58..4a1132fec 100644
--- a/test/stderr/3408
+++ b/test/stderr/3408
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -75,6 +77,8 @@ LOG: 10HmaX-000000005vi-0000 <= postmaster@??? H=(exim.test.ex) [V4NET.
>>> list element: @
>>> list element: @[]
>>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/3410 b/test/stderr/3410
index 81e1e5b21..926b7dd19 100644
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -24,6 +24,8 @@ LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
>>> list element: @
>>> list element: @[]
>>> rhu.barb in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -75,6 +77,8 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
>>> list element: @
>>> list element: @[]
>>> rhu.barb in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -112,6 +116,8 @@ LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
>>> list element: @
>>> list element: @[]
>>> rhu.barb in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/3500 b/test/stderr/3500
index 523413d16..1e6f32852 100644
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> test.host in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -39,6 +41,8 @@
>>> list element: @
>>> list element: @[]
>>> test.host in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -115,6 +119,8 @@ LOG: 10HmaY-000000005vi-0000 <= userx@??? H=(test.host) [10.0.0.1] P=esm
>>> list element: @
>>> list element: @[]
>>> test.host in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/4001 b/test/stderr/4001
index 042d6a204..e34bdfde1 100644
--- a/test/stderr/4001
+++ b/test/stderr/4001
@@ -10,6 +10,8 @@
>>> list element: @
>>> list element: @[]
>>> mailserver.test in helo_lookup_domains? no (end of list)
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/4510 b/test/stderr/4510
index 6ec9545c7..fae0093b7 100644
--- a/test/stderr/4510
+++ b/test/stderr/4510
@@ -14,6 +14,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/4530 b/test/stderr/4530
index eeeee68c8..05f5a0468 100644
--- a/test/stderr/4530
+++ b/test/stderr/4530
@@ -14,6 +14,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ... connected
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -25,6 +26,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stderr/5204 b/test/stderr/5204
index 63238c27c..6f3c13e10 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -242,6 +242,8 @@ some.name in helo_lookup_domains?
list element: @
list element: @[]
some.name in helo_lookup_domains? no (end of list)
+ list element: *
+ host in limits_advertise_hosts? yes (matched "*")
host in dsn_advertise_hosts? no (option unset)
host in pipelining_advertise_hosts?
list element: *
diff --git a/test/stderr/5403 b/test/stderr/5403
index f5f7a3831..3de6f4024 100644
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -11,6 +11,8 @@
>>> myhost.test.ex in helo_lookup_domains? yes (matched "@")
>>> looking up host name for 1.2.3.4
LOG: no host name found for IP address 1.2.3.4
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
@@ -45,6 +47,8 @@ LOG: 10HmaX-000000005vi-0000 <= CALLER@??? H=(myhost.test.ex) [1.2.3.
>>> myhost.test.ex in helo_lookup_domains? yes (matched "@")
>>> looking up host name for 1.2.3.4
LOG: no host name found for IP address 1.2.3.4
+>>> list element: *
+>>> host in limits_advertise_hosts? yes (matched "*")
>>> host in dsn_advertise_hosts? no (option unset)
>>> host in pipelining_advertise_hosts?
>>> list element: *
diff --git a/test/stderr/5410 b/test/stderr/5410
index 044734f76..24abaeafa 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -19,6 +19,8 @@ LOG: smtp_connection MAIN
├──────value: Tue, 2 Mar 1999 09:44:33 +0000
├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ list element: *
+ in limits_advertise_hosts? yes (matched "*")
in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts?
list element: *
@@ -110,6 +112,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -225,6 +228,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -638,6 +642,8 @@ LOG: smtp_connection MAIN
├──────value: Tue, 2 Mar 1999 09:44:33 +0000
├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ list element: *
+ in limits_advertise_hosts? yes (matched "*")
in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts?
list element: *
@@ -729,6 +735,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -1208,6 +1215,8 @@ LOG: smtp_connection MAIN
├──────value: Tue, 2 Mar 1999 09:44:33 +0000
├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ list element: *
+ in limits_advertise_hosts? yes (matched "*")
in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts?
list element: *
@@ -1299,6 +1308,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stderr/5420 b/test/stderr/5420
index 535542d26..ac3c16c81 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -19,6 +19,8 @@ LOG: smtp_connection MAIN
├──────value: Tue, 2 Mar 1999 09:44:33 +0000
├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ list element: *
+ in limits_advertise_hosts? yes (matched "*")
in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts?
list element: *
@@ -110,6 +112,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -225,6 +228,7 @@ cmd buf flush ddd bytes
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -638,6 +642,8 @@ LOG: smtp_connection MAIN
├──────value: Tue, 2 Mar 1999 09:44:33 +0000
├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ list element: *
+ in limits_advertise_hosts? yes (matched "*")
in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts?
list element: *
@@ -729,6 +735,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -1208,6 +1215,8 @@ LOG: smtp_connection MAIN
├──────value: Tue, 2 Mar 1999 09:44:33 +0000
├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ list element: *
+ in limits_advertise_hosts? yes (matched "*")
in dsn_advertise_hosts? no (option unset)
in pipelining_advertise_hosts?
list element: *
@@ -1299,6 +1308,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+ 250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stderr/5820 b/test/stderr/5820
index 717fe93ce..2dff7ec02 100644
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -39,6 +39,7 @@
>>> cmd buf flush 21 bytes
>>> SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
>>> 250-SIZE 52428800
+>>> 250-LIMITS MAILMAX=1000 RCPTMAX=50000
>>> 250-8BITMIME
>>> 250-PIPELINING
>>> 250-STARTTLS
@@ -54,6 +55,7 @@
>>> cmd buf flush 21 bytes
>>> SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
>>> 250-SIZE 52428800
+>>> 250-LIMITS MAILMAX=1000 RCPTMAX=50000
>>> 250-8BITMIME
>>> 250-PIPELINING
>>> 250 HELP
diff --git a/test/stderr/5840 b/test/stderr/5840
index e217f1502..59e479de6 100644
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -39,6 +39,7 @@
>>> cmd buf flush 21 bytes
>>> SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
>>> 250-SIZE 52428800
+>>> 250-LIMITS MAILMAX=1000 RCPTMAX=50000
>>> 250-8BITMIME
>>> 250-PIPELINING
>>> 250-STARTTLS
@@ -53,6 +54,7 @@
>>> cmd buf flush 21 bytes
>>> SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4]
>>> 250-SIZE 52428800
+>>> 250-LIMITS MAILMAX=1000 RCPTMAX=50000
>>> 250-8BITMIME
>>> 250-PIPELINING
>>> 250 HELP
diff --git a/test/stdout/0019 b/test/stdout/0019
index 5559e27d2..58ec8b2ee 100644
--- a/test/stdout/0019
+++ b/test/stdout/0019
@@ -19,6 +19,7 @@
501 argument must begin with #
250-the.local.host.name Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=5
250-8BITMIME
250-ETRN
250-PIPELINING
diff --git a/test/stdout/0028 b/test/stdout/0028
index 8bbf23864..b9e058254 100644
--- a/test/stdout/0028
+++ b/test/stdout/0028
@@ -8,6 +8,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0034 b/test/stdout/0034
index 1d81aaf2d..5727e1057 100644
--- a/test/stdout/0034
+++ b/test/stdout/0034
@@ -7,21 +7,25 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -53,6 +57,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -62,6 +67,7 @@
250 OK id=10HmbB-000000005vi-0000
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -71,6 +77,7 @@
250 OK id=10HmbC-000000005vi-0000
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -80,21 +87,25 @@
250 OK id=10HmbD-000000005vi-0000
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0035 b/test/stdout/0035
index 10c80a0d7..06c5c99e5 100644
--- a/test/stdout/0035
+++ b/test/stdout/0035
@@ -4,13 +4,15 @@ Connecting to 127.0.0.1 port 1225 ... connected
>>> ehlo rhu.barb
??? 250-
<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
-??? 250-
+??? 250-SIZE
<<< 250-SIZE 52428800
-??? 250-
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-8BITMIME
<<< 250-8BITMIME
-??? 250-
+??? 250-PIPELINING
<<< 250-PIPELINING
-??? 250
+??? 250 HELP
<<< 250 HELP
>>> mail from:<notsubmit@y>
??? 250
@@ -87,6 +89,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -118,6 +122,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0038 b/test/stdout/0038
index fec80a9ff..54857e7a6 100644
--- a/test/stdout/0038
+++ b/test/stdout/0038
@@ -6,6 +6,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.ex [V4NET.9.8.7]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -22,6 +23,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.ex [V4NET.9.8.7]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -38,6 +40,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.ex [V4NET.9.8.7]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -54,6 +57,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.ex [V4NET.9.8.7]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -70,6 +74,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.ex [V4NET.9.8.7]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -88,6 +93,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.ex [V4NET.9.8.6]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0043 b/test/stdout/0043
index c25b99168..657d50528 100644
--- a/test/stdout/0043
+++ b/test/stdout/0043
@@ -6,6 +6,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.0.0.97]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0044 b/test/stdout/0044
index b32174a63..b5446e168 100644
--- a/test/stdout/0044
+++ b/test/stdout/0044
@@ -6,6 +6,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.11.12.13]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -27,6 +28,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.11.12.13]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -46,6 +48,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.99.99.99]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0070 b/test/stdout/0070
index 18339e98a..3a80305ca 100644
--- a/test/stdout/0070
+++ b/test/stdout/0070
@@ -97,6 +97,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello rhubarb [99.99.99.99]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0079 b/test/stdout/0079
index 9a8b41ef6..74998992e 100644
--- a/test/stdout/0079
+++ b/test/stdout/0079
@@ -6,6 +6,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.11.12.14]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -21,6 +22,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at exim.test.ex [V4NET.11.12.13]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -32,6 +34,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at exim.test.ex [V4NET.11.12.14]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0080 b/test/stdout/0080
index afb1bfdf0..ccc5d030f 100644
--- a/test/stdout/0080
+++ b/test/stdout/0080
@@ -6,6 +6,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.11.12.14]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0121 b/test/stdout/0121
index f3fda94fb..f31f368eb 100644
--- a/test/stdout/0121
+++ b/test/stdout/0121
@@ -44,6 +44,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello foo.bar [127.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -51,6 +52,7 @@
250 Reset OK
250-the.local.host.name Hello foo.bar [127.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -58,6 +60,7 @@
250 Reset OK
250-the.local.host.name Hello foo.bar [127.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -65,6 +68,7 @@
250 Reset OK
250-the.local.host.name Hello foo.bar [127.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -72,6 +76,7 @@
250 Reset OK
250-the.local.host.name Hello foo.bar [127.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0138 b/test/stdout/0138
index 6520808c1..f945f9f09 100644
--- a/test/stdout/0138
+++ b/test/stdout/0138
@@ -6,6 +6,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.11.12.14]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -26,6 +27,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.11.12.13]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0159 b/test/stdout/0159
index bbb2be429..02869e73b 100644
--- a/test/stdout/0159
+++ b/test/stdout/0159
@@ -7,6 +7,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -33,6 +35,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -59,6 +63,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -85,6 +91,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0180 b/test/stdout/0180
index e2c14c4ab..70d782d34 100644
--- a/test/stdout/0180
+++ b/test/stdout/0180
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at some.host
250-SIZE 100
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -20,6 +21,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello some.host [1.2.3.4]
250-SIZE 500
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -32,6 +34,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello some.host [5.6.7.8]
250-SIZE 600
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -39,6 +42,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at some.host
250-SIZE 100
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0181 b/test/stdout/0181
index ae4da9034..acbc56e0a 100644
--- a/test/stdout/0181
+++ b/test/stdout/0181
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at some.host
250-SIZE 100
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0227 b/test/stdout/0227
index 5eabc24ee..16462813a 100644
--- a/test/stdout/0227
+++ b/test/stdout/0227
@@ -110,6 +110,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello root at me [V4NET.0.0.6]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -119,6 +120,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello root at me [V4NET.0.0.3]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -128,6 +130,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello root at me [V4NET.0.0.3]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -137,6 +140,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello root at me [V4NET.0.0.7]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0243 b/test/stdout/0243
index af7553042..8c9ae230d 100644
--- a/test/stdout/0243
+++ b/test/stdout/0243
@@ -6,6 +6,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello xxxx [1.2.3.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0282 b/test/stdout/0282
index 60ed701be..4c805fc47 100644
--- a/test/stdout/0282
+++ b/test/stdout/0282
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -38,6 +40,8 @@ Connecting to 127.0.0.1 port 1226 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0287 b/test/stdout/0287
index 1fb1f8141..4e5ae1581 100644
--- a/test/stdout/0287
+++ b/test/stdout/0287
@@ -4,15 +4,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
>>> ehlo rhu.barb
??? 250-
<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
-??? 250-
+??? 250-SIZE
<<< 250-SIZE 52428800
-??? 250-
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-8BITMIME
<<< 250-8BITMIME
-??? 250-
+??? 250-ETRN
<<< 250-ETRN
-??? 250-
+??? 250-PIPELINING
<<< 250-PIPELINING
-??? 250
+??? 250 HELP
<<< 250 HELP
>>> ETRN one
??? 250
diff --git a/test/stdout/0300 b/test/stdout/0300
index 0766a4900..dd9cc8507 100644
--- a/test/stdout/0300
+++ b/test/stdout/0300
@@ -14,6 +14,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -60,6 +62,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250
<<< 250 HELP
@@ -86,6 +90,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -106,6 +112,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250
<<< 250 HELP
@@ -122,6 +130,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0301 b/test/stdout/0301
index 0d9b81a2d..a22c50070 100644
--- a/test/stdout/0301
+++ b/test/stdout/0301
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -27,6 +29,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -65,6 +69,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0303 b/test/stdout/0303
index f88fb299a..72e317720 100644
--- a/test/stdout/0303
+++ b/test/stdout/0303
@@ -14,6 +14,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello ten-1.test.ex [V4NET.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +35,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -53,6 +55,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0371 b/test/stdout/0371
index 75e1085a7..421749843 100644
--- a/test/stdout/0371
+++ b/test/stdout/0371
@@ -6,6 +6,7 @@
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-mail.test.ex Hello something [V4NET.0.0.0]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-VRFY
250-PIPELINING
diff --git a/test/stdout/0384 b/test/stdout/0384
index e2c165c0b..25bc1eabb 100644
--- a/test/stdout/0384
+++ b/test/stdout/0384
@@ -6,6 +6,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello [V4NET.9.8.7] [V4NET.9.8.7]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0448 b/test/stdout/0448
index a915781bd..0654ffb0a 100644
--- a/test/stdout/0448
+++ b/test/stdout/0448
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at x.y.z
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at x.y.z
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0451 b/test/stdout/0451
index 92efc311a..df1124f45 100644
--- a/test/stdout/0451
+++ b/test/stdout/0451
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at a.b.c.d
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0458 b/test/stdout/0458
index 47d52c1ac..a8e41b9cc 100644
--- a/test/stdout/0458
+++ b/test/stdout/0458
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -61,6 +63,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -115,6 +119,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -181,6 +187,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0460 b/test/stdout/0460
index 082635b97..e9a538b6b 100644
--- a/test/stdout/0460
+++ b/test/stdout/0460
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0473 b/test/stdout/0473
index 7ac03f12a..82ff3bf74 100644
--- a/test/stdout/0473
+++ b/test/stdout/0473
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -24,6 +25,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -33,6 +35,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -42,6 +45,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -52,6 +56,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -61,6 +66,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -74,6 +80,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -85,6 +92,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -104,6 +112,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -113,6 +122,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -134,6 +144,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -143,6 +154,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0485 b/test/stdout/0485
index 0d24cdb98..3d7beff74 100644
--- a/test/stdout/0485
+++ b/test/stdout/0485
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at x.y.z [1.2.3.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0486 b/test/stdout/0486
index 9f3c452e3..535075a27 100644
--- a/test/stdout/0486
+++ b/test/stdout/0486
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at x.y.z
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0487 b/test/stdout/0487
index e422660ee..8194c7559 100644
--- a/test/stdout/0487
+++ b/test/stdout/0487
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at x.y
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0495 b/test/stdout/0495
index 5d453389a..8129db3aa 100644
--- a/test/stdout/0495
+++ b/test/stdout/0495
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at a.b
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -13,6 +14,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at a.b
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0502 b/test/stdout/0502
index eeb79533f..2f51d0eef 100644
--- a/test/stdout/0502
+++ b/test/stdout/0502
@@ -30,6 +30,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0513 b/test/stdout/0513
index d0fc6ede1..91d4c8482 100644
--- a/test/stdout/0513
+++ b/test/stdout/0513
@@ -6,6 +6,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello a.b.c.d [1.2.3.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0524 b/test/stdout/0524
index fad288a29..93c1e87dc 100644
--- a/test/stdout/0524
+++ b/test/stdout/0524
@@ -6,6 +6,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello csa1.test.ex [V4NET.9.8.7]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -13,6 +14,7 @@
250 Reset OK
250-myhost.test.ex Hello csa2.test.ex [V4NET.9.8.7]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -26,6 +28,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello csa1.test.ex [V4NET.9.8.8]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -33,6 +36,7 @@
250 Reset OK
250-myhost.test.ex Hello csa2.test.ex [V4NET.9.8.8]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0536 b/test/stdout/0536
index ff1beab89..8b8c6cea0 100644
--- a/test/stdout/0536
+++ b/test/stdout/0536
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -31,6 +32,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0537 b/test/stdout/0537
index afbab0d29..18663069e 100644
--- a/test/stdout/0537
+++ b/test/stdout/0537
@@ -13,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello ident at hostname [5.6.7.8]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +24,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello ident at hostname [5.6.7.8]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0544 b/test/stdout/0544
index d267fea04..fb58b95de 100644
--- a/test/stdout/0544
+++ b/test/stdout/0544
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at ehlo.domain
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0546 b/test/stdout/0546
index c1fc53b5e..200cc83d3 100644
--- a/test/stdout/0546
+++ b/test/stdout/0546
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-One line
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -13,6 +14,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-Two
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
299-With code
299-SIZE 52428800
+299-LIMITS MAILMAX=1000 RCPTMAX=50000
299-8BITMIME
299-PIPELINING
299 HELP
diff --git a/test/stdout/0547 b/test/stdout/0547
index 418ddc4ba..84c691121 100644
--- a/test/stdout/0547
+++ b/test/stdout/0547
@@ -17,6 +17,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-myhost.test.ex Hello x.y.z [127.0.0.1]
??? 250
<<< 250-SIZE 52428800
+??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250
<<< 250-8BITMIME
??? 250
@@ -39,6 +41,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250
<<< 250-SIZE 52428800
??? 250
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250
<<< 250-PIPELINING
diff --git a/test/stdout/0549 b/test/stdout/0549
index 7609d5146..d74b70672 100644
--- a/test/stdout/0549
+++ b/test/stdout/0549
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250
<<< 250 HELP
@@ -23,6 +25,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0556 b/test/stdout/0556
index 73046aaa2..c4ebf738e 100644
--- a/test/stdout/0556
+++ b/test/stdout/0556
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -33,6 +35,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250
<<< 250 HELP
@@ -51,6 +55,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250
<<< 250 HELP
diff --git a/test/stdout/0558 b/test/stdout/0558
index b80b14933..50df10e1e 100644
--- a/test/stdout/0558
+++ b/test/stdout/0558
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -19,6 +20,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0559 b/test/stdout/0559
index b5cc62c49..15a2f078b 100644
--- a/test/stdout/0559
+++ b/test/stdout/0559
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0562 b/test/stdout/0562
index a32896899..3c96a4fdf 100644
--- a/test/stdout/0562
+++ b/test/stdout/0562
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -75,6 +77,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0566 b/test/stdout/0566
index c17e9e485..5b1071af2 100644
--- a/test/stdout/0566
+++ b/test/stdout/0566
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -10,6 +11,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -19,6 +21,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -28,6 +31,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -37,6 +41,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -46,6 +51,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -55,6 +61,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -64,6 +71,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -73,6 +81,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -82,6 +91,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -91,6 +101,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -102,6 +113,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -113,6 +125,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -124,6 +137,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/0579 b/test/stdout/0579
index 062573ebd..82ed646ae 100644
--- a/test/stdout/0579
+++ b/test/stdout/0579
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0583 b/test/stdout/0583
index 9f70b7343..cab36ad45 100644
--- a/test/stdout/0583
+++ b/test/stdout/0583
@@ -6,6 +6,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-myhost.test.ex Hello test [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
diff --git a/test/stdout/0612 b/test/stdout/0612
index 92b95b4e5..38ff3f068 100644
--- a/test/stdout/0612
+++ b/test/stdout/0612
@@ -6,6 +6,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-myhost.test.ex Hello testclient [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250 HELP
<<< 250 HELP
End of script
@@ -17,6 +19,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-DSN
<<< 250-DSN
??? 250 HELP
@@ -49,6 +53,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-DSN
<<< 250-DSN
??? 250 HELP
@@ -78,6 +84,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-DSN
<<< 250-DSN
??? 250 HELP
@@ -107,6 +115,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-DSN
<<< 250-DSN
??? 250 HELP
@@ -136,6 +146,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-DSN
<<< 250-DSN
??? 250 HELP
@@ -167,6 +179,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
<<< 250-myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-DSN
<<< 250-DSN
??? 250 HELP
diff --git a/test/stdout/0628 b/test/stdout/0628
index 4821f0180..422d6cd41 100644
--- a/test/stdout/0628
+++ b/test/stdout/0628
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -40,6 +42,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0629 b/test/stdout/0629
index eaa8463ce..8b3b2ff8f 100644
--- a/test/stdout/0629
+++ b/test/stdout/0629
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0630 b/test/stdout/0630
index 00618e6c8..c7a2173d5 100644
--- a/test/stdout/0630
+++ b/test/stdout/0630
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0631 b/test/stdout/0631
index b3f7e1dc6..096fc1bc9 100644
--- a/test/stdout/0631
+++ b/test/stdout/0631
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/0908 b/test/stdout/0908
index 2fbed0632..d86631f77 100644
--- a/test/stdout/0908
+++ b/test/stdout/0908
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1224 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1001 b/test/stdout/1001
index dede9eb19..fe83d63c5 100644
--- a/test/stdout/1001
+++ b/test/stdout/1001
@@ -7,6 +7,8 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -33,6 +35,8 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -59,6 +63,8 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1103 b/test/stdout/1103
index 6bedb029a..4529e2a75 100644
--- a/test/stdout/1103
+++ b/test/stdout/1103
@@ -7,6 +7,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -25,6 +27,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -49,6 +53,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1104 b/test/stdout/1104
index 3fcc501b3..116f16952 100644
--- a/test/stdout/1104
+++ b/test/stdout/1104
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -33,6 +35,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1105 b/test/stdout/1105
index 39f8610c2..07fbc8602 100644
--- a/test/stdout/1105
+++ b/test/stdout/1105
@@ -16,6 +16,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -34,6 +36,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1106 b/test/stdout/1106
index ba53967e0..88817d57b 100644
--- a/test/stdout/1106
+++ b/test/stdout/1106
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1107 b/test/stdout/1107
index bfef01151..47a2b1614 100644
--- a/test/stdout/1107
+++ b/test/stdout/1107
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -30,6 +32,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1108 b/test/stdout/1108
index de269abc5..90a8cb285 100644
--- a/test/stdout/1108
+++ b/test/stdout/1108
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -25,6 +27,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -56,6 +60,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1109 b/test/stdout/1109
index 5022d27b3..3523db790 100644
--- a/test/stdout/1109
+++ b/test/stdout/1109
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at a.b.c [10.9.8.10]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/1110 b/test/stdout/1110
index cf8661c6e..e267cabac 100644
--- a/test/stdout/1110
+++ b/test/stdout/1110
@@ -9,6 +9,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1111 b/test/stdout/1111
index 3f280e0d5..eb8d51e99 100644
--- a/test/stdout/1111
+++ b/test/stdout/1111
@@ -7,6 +7,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/1112 b/test/stdout/1112
index 1ccd96b88..c272458c2 100644
--- a/test/stdout/1112
+++ b/test/stdout/1112
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -34,6 +36,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2002 b/test/stdout/2002
index e8707e377..e97f6b460 100644
--- a/test/stdout/2002
+++ b/test/stdout/2002
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -25,6 +27,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -56,6 +60,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -96,6 +102,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
@@ -125,6 +133,8 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -166,6 +176,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -208,6 +220,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2014 b/test/stdout/2014
index edd498aa8..94b9bdee8 100644
--- a/test/stdout/2014
+++ b/test/stdout/2014
@@ -8,6 +8,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -34,6 +36,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -71,6 +75,8 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -108,6 +114,8 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -145,6 +153,8 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -173,6 +183,8 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -210,6 +222,8 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -239,6 +253,8 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -276,6 +292,8 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2024 b/test/stdout/2024
index 9a83c412c..7a930c2b1 100644
--- a/test/stdout/2024
+++ b/test/stdout/2024
@@ -9,6 +9,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -36,6 +38,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2029 b/test/stdout/2029
index f2108b65d..3017610d1 100644
--- a/test/stdout/2029
+++ b/test/stdout/2029
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2034 b/test/stdout/2034
index 19e959b8b..3998bf198 100644
--- a/test/stdout/2034
+++ b/test/stdout/2034
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -28,6 +30,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2102 b/test/stdout/2102
index 7f8e4f825..ea3682f60 100644
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -25,6 +27,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -56,6 +60,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -74,6 +80,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -105,6 +113,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -134,6 +144,8 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -152,6 +164,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -183,6 +197,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -201,6 +217,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2114.openssl_1_1_1 b/test/stdout/2114.openssl_1_1_1
index a0b9fe33e..2753b9ba3 100644
--- a/test/stdout/2114.openssl_1_1_1
+++ b/test/stdout/2114.openssl_1_1_1
@@ -8,6 +8,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -43,6 +45,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -80,6 +84,8 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -117,6 +123,8 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -154,6 +162,8 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -186,6 +196,8 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -223,6 +235,8 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -255,6 +269,8 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -292,6 +308,8 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2124.openssl_1_1_1 b/test/stdout/2124.openssl_1_1_1
index 2f4be205e..8fb045a20 100644
--- a/test/stdout/2124.openssl_1_1_1
+++ b/test/stdout/2124.openssl_1_1_1
@@ -9,6 +9,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -40,6 +42,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2132.openssl_1_1_1 b/test/stdout/2132.openssl_1_1_1
index 08dbaa344..fda61ed5b 100644
--- a/test/stdout/2132.openssl_1_1_1
+++ b/test/stdout/2132.openssl_1_1_1
@@ -8,6 +8,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -50,6 +52,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -92,6 +96,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -124,6 +130,8 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.e
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/2150 b/test/stdout/2150
index f2108b65d..3017610d1 100644
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3000 b/test/stdout/3000
index 9613d0e45..8a0bd00ab 100644
--- a/test/stdout/3000
+++ b/test/stdout/3000
@@ -30,6 +30,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at x.y.z
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -44,6 +45,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello x.y.z [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/3208 b/test/stdout/3208
index 2254a7ea3..a5ab29bf4 100644
--- a/test/stdout/3208
+++ b/test/stdout/3208
@@ -6,6 +6,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello remote.host [V4NET.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/3400 b/test/stdout/3400
index 9ed13f173..1fbcb8c6c 100644
--- a/test/stdout/3400
+++ b/test/stdout/3400
@@ -19,6 +19,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -53,6 +54,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.host [10.0.0.3]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -70,6 +72,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testclient.ex [10.0.0.3]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -104,6 +107,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -116,6 +120,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -128,6 +133,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -141,6 +147,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -159,6 +166,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -172,6 +180,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -184,6 +193,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -197,6 +207,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -216,6 +227,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.host [10.0.0.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -226,6 +238,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -238,6 +251,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -251,6 +265,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -264,6 +279,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -277,6 +293,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.2]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -289,6 +306,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -321,6 +339,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -346,6 +365,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -360,6 +380,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -372,6 +393,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.6]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
diff --git a/test/stdout/3402 b/test/stdout/3402
index 444d46c06..5a8937db1 100644
--- a/test/stdout/3402
+++ b/test/stdout/3402
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
@@ -11,6 +12,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
diff --git a/test/stdout/3403 b/test/stdout/3403
index e95ad4553..c3af386f9 100644
--- a/test/stdout/3403
+++ b/test/stdout/3403
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
diff --git a/test/stdout/3406 b/test/stdout/3406
index 81d58e350..b9f3054f1 100644
--- a/test/stdout/3406
+++ b/test/stdout/3406
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.ex [10.0.0.2]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH FIRST
@@ -10,6 +11,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.ex [10.0.0.3]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH SECOND
@@ -19,6 +21,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.ex [10.0.0.2]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH FIRST
@@ -28,6 +31,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.ex [10.0.0.3]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH SECOND
diff --git a/test/stdout/3408 b/test/stdout/3408
index e17265c20..dd0cee632 100644
--- a/test/stdout/3408
+++ b/test/stdout/3408
@@ -6,6 +6,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.11.12.14]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
@@ -27,6 +28,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello exim.test.ex [V4NET.11.12.14]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
diff --git a/test/stdout/3409 b/test/stdout/3409
index ae2912f20..767a4c2e7 100644
--- a/test/stdout/3409
+++ b/test/stdout/3409
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=5
250-8BITMIME
250-ETRN
250-PIPELINING
@@ -14,6 +15,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at a.b.c
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=5
250-8BITMIME
250-ETRN
250-PIPELINING
diff --git a/test/stdout/3410 b/test/stdout/3410
index bc4b2abd3..30e4e1741 100644
--- a/test/stdout/3410
+++ b/test/stdout/3410
@@ -10,6 +10,7 @@
250 Reset OK
250-myhost.test.ex Hello rhu.barb [5.6.9.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN LOGIN
@@ -30,6 +31,7 @@
250 Reset OK
250-myhost.test.ex Hello rhu.barb [5.6.10.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN LOGIN
@@ -46,6 +48,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello rhu.barb [5.6.10.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN LOGIN
diff --git a/test/stdout/3411 b/test/stdout/3411
index 164afd2e4..cc0cd8600 100644
--- a/test/stdout/3411
+++ b/test/stdout/3411
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at rhu.barb [10.0.0.0]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
diff --git a/test/stdout/3413 b/test/stdout/3413
index 5370c5e40..dbc734e0e 100644
--- a/test/stdout/3413
+++ b/test/stdout/3413
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at x.y.z
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
diff --git a/test/stdout/3414 b/test/stdout/3414
index a96858c19..6e029fa8d 100644
--- a/test/stdout/3414
+++ b/test/stdout/3414
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
@@ -10,6 +11,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
@@ -19,6 +21,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
@@ -28,6 +31,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
@@ -38,6 +42,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
@@ -48,6 +53,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at xxxx
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
diff --git a/test/stdout/3415 b/test/stdout/3415
index 6631174a9..52878c73f 100644
--- a/test/stdout/3415
+++ b/test/stdout/3415
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -54,6 +56,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -89,6 +93,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -124,6 +130,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3416 b/test/stdout/3416
index 671998a86..4c75b4193 100644
--- a/test/stdout/3416
+++ b/test/stdout/3416
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at the.client
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
@@ -11,6 +12,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at the.client
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
@@ -22,6 +24,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at the.client
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH PLAIN
diff --git a/test/stdout/3418 b/test/stdout/3418
index 0ed179c33..7773ec3c1 100644
--- a/test/stdout/3418
+++ b/test/stdout/3418
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH MYLOGIN
@@ -10,6 +11,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-AUTH MYLOGIN
diff --git a/test/stdout/3450 b/test/stdout/3450
index 1eb09c9a9..e15bfb7a7 100644
--- a/test/stdout/3450
+++ b/test/stdout/3450
@@ -7,6 +7,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -32,6 +34,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -55,6 +59,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3453 b/test/stdout/3453
index 098973d42..2ac8aaed1 100644
--- a/test/stdout/3453
+++ b/test/stdout/3453
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -40,6 +42,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3454 b/test/stdout/3454
index 5050b7f18..99e561800 100644
--- a/test/stdout/3454
+++ b/test/stdout/3454
@@ -6,6 +6,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
@@ -33,6 +35,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
@@ -53,6 +57,8 @@ Succeeded in starting TLS
<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
diff --git a/test/stdout/3460 b/test/stdout/3460
index 1eb09c9a9..e15bfb7a7 100644
--- a/test/stdout/3460
+++ b/test/stdout/3460
@@ -7,6 +7,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -32,6 +34,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -55,6 +59,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3463 b/test/stdout/3463
index 098973d42..2ac8aaed1 100644
--- a/test/stdout/3463
+++ b/test/stdout/3463
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -40,6 +42,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3464 b/test/stdout/3464
index 2268389b0..cdcc0d77d 100644
--- a/test/stdout/3464
+++ b/test/stdout/3464
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -34,6 +36,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -54,6 +58,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3500 b/test/stdout/3500
index ee35a18ba..9599c088c 100644
--- a/test/stdout/3500
+++ b/test/stdout/3500
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -18,6 +19,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -36,6 +38,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.host [10.0.0.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -51,6 +54,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.host [10.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
@@ -76,6 +80,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello test.host [10.0.0.5]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-ETRN
250-VRFY
diff --git a/test/stdout/3600 b/test/stdout/3600
index 1254d6cb2..bfe98842c 100644
--- a/test/stdout/3600
+++ b/test/stdout/3600
@@ -8,6 +8,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -34,6 +36,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3720 b/test/stdout/3720
index 854382ee5..8fc42f57f 100644
--- a/test/stdout/3720
+++ b/test/stdout/3720
@@ -9,6 +9,8 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.org/server2.example.org/server2.e
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -27,6 +29,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3721 b/test/stdout/3721
index 854382ee5..8fc42f57f 100644
--- a/test/stdout/3721
+++ b/test/stdout/3721
@@ -9,6 +9,8 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.org/server2.example.org/server2.e
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -27,6 +29,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3800 b/test/stdout/3800
index 998df3a19..7df52daf8 100644
--- a/test/stdout/3800
+++ b/test/stdout/3800
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/3820 b/test/stdout/3820
index 25723136a..db21465cb 100644
--- a/test/stdout/3820
+++ b/test/stdout/3820
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/4000 b/test/stdout/4000
index e38902d59..b9098d554 100644
--- a/test/stdout/4000
+++ b/test/stdout/4000
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -45,6 +49,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -56,6 +61,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -67,6 +73,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -78,6 +85,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4001 b/test/stdout/4001
index 63b44505f..7b61beb1a 100644
--- a/test/stdout/4001
+++ b/test/stdout/4001
@@ -6,6 +6,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello mailserver.test [127.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4002 b/test/stdout/4002
index 9bbff7f0f..4e2dda08d 100644
--- a/test/stdout/4002
+++ b/test/stdout/4002
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4003 b/test/stdout/4003
index 333ef2e4f..39ff75100 100644
--- a/test/stdout/4003
+++ b/test/stdout/4003
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello fromuser at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello fromuser at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello fromuser at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello fromuser at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4004 b/test/stdout/4004
index 40d631402..16898c2e1 100644
--- a/test/stdout/4004
+++ b/test/stdout/4004
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4006 b/test/stdout/4006
index 39339ba02..6f3d15eec 100644
--- a/test/stdout/4006
+++ b/test/stdout/4006
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -45,6 +49,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -56,6 +61,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -67,6 +73,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4007 b/test/stdout/4007
index 07de64414..8615c9c48 100644
--- a/test/stdout/4007
+++ b/test/stdout/4007
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -13,6 +14,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -24,6 +26,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -35,6 +38,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -46,6 +50,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -58,6 +63,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4008 b/test/stdout/4008
index b98a53c68..029a913b6 100644
--- a/test/stdout/4008
+++ b/test/stdout/4008
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4009 b/test/stdout/4009
index fb69ffcf6..fec79c084 100644
--- a/test/stdout/4009
+++ b/test/stdout/4009
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -45,6 +49,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4010 b/test/stdout/4010
index a4933d219..15c1aa4ac 100644
--- a/test/stdout/4010
+++ b/test/stdout/4010
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -45,6 +49,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4011 b/test/stdout/4011
index 04a7ad4a5..4b201856d 100644
--- a/test/stdout/4011
+++ b/test/stdout/4011
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -45,6 +49,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -56,6 +61,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -67,6 +73,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4012 b/test/stdout/4012
index 95a9453ce..3816b5f54 100644
--- a/test/stdout/4012
+++ b/test/stdout/4012
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4013 b/test/stdout/4013
index 5ed067271..533a9a52b 100644
--- a/test/stdout/4013
+++ b/test/stdout/4013
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4014 b/test/stdout/4014
index e0d02cadb..121fb0157 100644
--- a/test/stdout/4014
+++ b/test/stdout/4014
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4015 b/test/stdout/4015
index 072c57e2b..af8161d0f 100644
--- a/test/stdout/4015
+++ b/test/stdout/4015
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello fromuser at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4017 b/test/stdout/4017
index 079b7dade..92ce85fe4 100644
--- a/test/stdout/4017
+++ b/test/stdout/4017
@@ -2,6 +2,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -14,6 +15,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -25,6 +27,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -36,6 +39,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -47,6 +51,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -58,6 +63,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4020 b/test/stdout/4020
index 5890d218f..47dc6e92b 100644
--- a/test/stdout/4020
+++ b/test/stdout/4020
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4021 b/test/stdout/4021
index 40d99b05c..5333dee39 100644
--- a/test/stdout/4021
+++ b/test/stdout/4021
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4027 b/test/stdout/4027
index be14c3534..87a37d3a5 100644
--- a/test/stdout/4027
+++ b/test/stdout/4027
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/4033 b/test/stdout/4033
index 0e729668e..a43f3d6c1 100644
--- a/test/stdout/4033
+++ b/test/stdout/4033
@@ -7,6 +7,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello plainclient [127.0.0.1]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -28,6 +29,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello xclientproxy [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-XCLIENT ADDR NAME PORT LOGIN DESTADDR DESTPORT
@@ -35,6 +37,7 @@
220 XCLIENT success
250-myhost.test.ex Hello proxylookedupname.net [127.0.0.2]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-XCLIENT ADDR NAME PORT LOGIN DESTADDR DESTPORT
@@ -49,6 +52,7 @@
220 XCLIENT success
250-myhost.test.ex Hello anotherhelo [127.0.0.3]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-XCLIENT ADDR NAME PORT LOGIN DESTADDR DESTPORT
@@ -75,6 +79,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello xclientproxy [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-XCLIENT ADDR NAME PORT LOGIN DESTADDR DESTPORT
@@ -93,6 +98,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello xclientproxy [ip4.ip4.ip4.ip4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-XCLIENT ADDR NAME PORT LOGIN DESTADDR DESTPORT
diff --git a/test/stdout/4201 b/test/stdout/4201
index 1d74546b1..c38891b00 100644
--- a/test/stdout/4201
+++ b/test/stdout/4201
@@ -6,6 +6,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-the.local.host.name Hello client [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
@@ -41,6 +43,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-the.local.host.name Hello client [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
@@ -86,6 +90,7 @@ End of script
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -103,6 +108,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-the.local.host.name Hello client [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
diff --git a/test/stdout/4203 b/test/stdout/4203
index 3a7c70957..f74201119 100644
--- a/test/stdout/4203
+++ b/test/stdout/4203
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
diff --git a/test/stdout/4204 b/test/stdout/4204
index e770c1b92..970ba54ef 100644
--- a/test/stdout/4204
+++ b/test/stdout/4204
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -13,6 +14,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -25,6 +27,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -35,6 +38,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
diff --git a/test/stdout/4205 b/test/stdout/4205
index 17f63b9ce..828630087 100644
--- a/test/stdout/4205
+++ b/test/stdout/4205
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
diff --git a/test/stdout/4206 b/test/stdout/4206
index ad37ac936..fd69e8279 100644
--- a/test/stdout/4206
+++ b/test/stdout/4206
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -13,6 +14,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -25,6 +27,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.sfail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -37,6 +40,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.sfail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
diff --git a/test/stdout/4207 b/test/stdout/4207
index c34032c63..4e151aa37 100644
--- a/test/stdout/4207
+++ b/test/stdout/4207
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -13,6 +14,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -25,6 +27,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
diff --git a/test/stdout/4208 b/test/stdout/4208
index b4bf77279..0a648ef55 100644
--- a/test/stdout/4208
+++ b/test/stdout/4208
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
@@ -11,6 +12,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-SMTPUTF8
diff --git a/test/stdout/4211 b/test/stdout/4211
index 5056cda9e..cfc51a383 100644
--- a/test/stdout/4211
+++ b/test/stdout/4211
@@ -6,6 +6,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-the.local.host.name Hello client [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
@@ -43,6 +45,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-the.local.host.name Hello client [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
@@ -75,6 +79,7 @@ End of script
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4213 b/test/stdout/4213
index 90b76e176..8b80750b9 100644
--- a/test/stdout/4213
+++ b/test/stdout/4213
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4214 b/test/stdout/4214
index f6838d0a6..50157fbfe 100644
--- a/test/stdout/4214
+++ b/test/stdout/4214
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -14,6 +15,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -27,6 +29,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -38,6 +41,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4215 b/test/stdout/4215
index d1afd34a8..16c365639 100644
--- a/test/stdout/4215
+++ b/test/stdout/4215
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4216 b/test/stdout/4216
index 2f33415f8..20391e511 100644
--- a/test/stdout/4216
+++ b/test/stdout/4216
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -14,6 +15,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -27,6 +29,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.sfail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -40,6 +43,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.sfail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4221 b/test/stdout/4221
index 5056cda9e..cfc51a383 100644
--- a/test/stdout/4221
+++ b/test/stdout/4221
@@ -6,6 +6,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-the.local.host.name Hello client [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
@@ -43,6 +45,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 250-the.local.host.name Hello client [127.0.0.1]
??? 250-SIZE
<<< 250-SIZE 52428800
+??? 250-LIMITS
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
??? 250-8BITMIME
<<< 250-8BITMIME
??? 250-PIPELINING
@@ -75,6 +79,7 @@ End of script
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4223 b/test/stdout/4223
index 90b76e176..8b80750b9 100644
--- a/test/stdout/4223
+++ b/test/stdout/4223
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4224 b/test/stdout/4224
index f6838d0a6..50157fbfe 100644
--- a/test/stdout/4224
+++ b/test/stdout/4224
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -14,6 +15,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -27,6 +29,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -38,6 +41,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4225 b/test/stdout/4225
index d1afd34a8..16c365639 100644
--- a/test/stdout/4225
+++ b/test/stdout/4225
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4226 b/test/stdout/4226
index 2f33415f8..20391e511 100644
--- a/test/stdout/4226
+++ b/test/stdout/4226
@@ -1,6 +1,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -14,6 +15,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -27,6 +29,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.sfail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -40,6 +43,7 @@
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.sfail
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/4519 b/test/stdout/4519
index 4d4f4650a..e59f2bd73 100644
--- a/test/stdout/4519
+++ b/test/stdout/4519
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1224 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -45,6 +47,8 @@ Connecting to 127.0.0.1 port 1224 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/4539 b/test/stdout/4539
index 114d4f6ea..108df0588 100644
--- a/test/stdout/4539
+++ b/test/stdout/4539
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1224 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -56,6 +58,8 @@ Connecting to 127.0.0.1 port 1224 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/5204 b/test/stdout/5204
index 22f01be9f..233251373 100644
--- a/test/stdout/5204
+++ b/test/stdout/5204
@@ -21,6 +21,7 @@ postmaster@???
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello some.name [V4NET.2.3.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5400 b/test/stdout/5400
index 6089910b9..55b750449 100644
--- a/test/stdout/5400
+++ b/test/stdout/5400
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -35,6 +38,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -46,6 +50,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -58,6 +63,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -70,6 +76,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -82,6 +89,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -94,6 +102,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -106,6 +115,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -118,6 +128,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5401 b/test/stdout/5401
index ffbb47b88..e69ac8ad5 100644
--- a/test/stdout/5401
+++ b/test/stdout/5401
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -22,6 +24,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5402 b/test/stdout/5402
index 8b32d4ccd..1fc10a82f 100644
--- a/test/stdout/5402
+++ b/test/stdout/5402
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -10,6 +11,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5403 b/test/stdout/5403
index e99e08231..f16df8d31 100644
--- a/test/stdout/5403
+++ b/test/stdout/5403
@@ -6,6 +6,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello myhost.test.ex [1.2.3.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -25,6 +26,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello myhost.test.ex [1.2.3.4]
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5404 b/test/stdout/5404
index 98a33314e..f56727149 100644
--- a/test/stdout/5404
+++ b/test/stdout/5404
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5405 b/test/stdout/5405
index db542c353..ffa58ac74 100644
--- a/test/stdout/5405
+++ b/test/stdout/5405
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -12,6 +13,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -23,6 +25,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -34,6 +37,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -43,6 +47,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -54,6 +59,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -65,6 +71,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -76,6 +83,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -87,6 +95,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -98,6 +107,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5406 b/test/stdout/5406
index 054539740..289994cee 100644
--- a/test/stdout/5406
+++ b/test/stdout/5406
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
@@ -16,6 +17,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5407 b/test/stdout/5407
index 79b92837f..82ff91b29 100644
--- a/test/stdout/5407
+++ b/test/stdout/5407
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5409 b/test/stdout/5409
index bed9fccfe..09059e55a 100644
--- a/test/stdout/5409
+++ b/test/stdout/5409
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250 HELP
diff --git a/test/stdout/5410 b/test/stdout/5410
index 2cd93d507..56b13db0c 100644
--- a/test/stdout/5410
+++ b/test/stdout/5410
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -13,6 +14,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -25,6 +27,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/5420 b/test/stdout/5420
index 2cd93d507..56b13db0c 100644
--- a/test/stdout/5420
+++ b/test/stdout/5420
@@ -1,6 +1,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -13,6 +14,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
@@ -25,6 +27,7 @@
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
250-SIZE 52428800
+250-LIMITS MAILMAX=1000 RCPTMAX=50000
250-8BITMIME
250-PIPELINING
250-STARTTLS
diff --git a/test/stdout/5500 b/test/stdout/5500
index b6fb96e7a..346f4f40e 100644
--- a/test/stdout/5500
+++ b/test/stdout/5500
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -54,6 +56,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -96,6 +100,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -129,6 +135,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -171,6 +179,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -213,6 +223,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/5600 b/test/stdout/5600
index 5493ef79a..a8bcb355c 100644
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -9,6 +9,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -46,6 +48,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -71,6 +75,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -96,6 +102,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -114,6 +122,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/5610 b/test/stdout/5610
index 7dbadc46e..cfbad9572 100644
--- a/test/stdout/5610
+++ b/test/stdout/5610
@@ -9,6 +9,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -46,6 +48,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -71,6 +75,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -96,6 +102,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -114,6 +122,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
diff --git a/test/stdout/5650 b/test/stdout/5650
index b4d72e801..199c5e4d4 100644
--- a/test/stdout/5650
+++ b/test/stdout/5650
@@ -9,6 +9,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -46,6 +48,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -69,6 +73,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -92,6 +98,8 @@ Key file = aux-fixed/cert2
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
@@ -110,6 +118,8 @@ Succeeded in starting TLS
??? 250-
<<< 250-SIZE 52428800
??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
<<< 250-8BITMIME
??? 250-
<<< 250-PIPELINING
--
## 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/
