diff options
Diffstat (limited to 'test')
33 files changed, 1263 insertions, 12 deletions
diff --git a/test/aux-var-src/tls_conf_prefix b/test/aux-var-src/tls_conf_prefix index 541817668..e3f09b98b 100644 --- a/test/aux-var-src/tls_conf_prefix +++ b/test/aux-var-src/tls_conf_prefix @@ -24,3 +24,6 @@ pipelining_connect_advertise_hosts = : .ifdef _HAVE_DMARC dmarc_tld_file = .endif +.ifdef _EXP_LIMITS +limits_advertise_hosts = !* +.endif diff --git a/test/confs/0453 b/test/confs/0453 index 3ecc86591..c611d4a41 100644 --- a/test/confs/0453 +++ b/test/confs/0453 @@ -1,6 +1,6 @@ # Exim test configuration 0453 -LIMIT= +ERROR_DETAILS= .include DIR/aux-var/std_conf_prefix @@ -11,7 +11,7 @@ primary_hostname = myhost.test.ex qualify_domain = test.ex -LIMIT +ERROR_DETAILS # End diff --git a/test/confs/0564 b/test/confs/0564 index de71325af..fd38c6213 100644 --- a/test/confs/0564 +++ b/test/confs/0564 @@ -15,6 +15,9 @@ pipelining_connect_advertise_hosts = .ifdef _HAVE_DMARC dmarc_tld_file = .endif +.ifdef _OPT_MAIN_LIMITS_ADVERTISE_HOSTS +limits_advertise_hosts = !* +.endif # ----- Main settings ----- diff --git a/test/confs/0900 b/test/confs/0900 index 7775fc4b0..a56ec0e5c 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -23,7 +23,9 @@ pipelining_connect_advertise_hosts = : .ifdef _HAVE_DMARC dmarc_tld_file = .endif - +.ifdef _OPT_MAIN_LIMITS_ADVERTISE_HOSTS +limits_advertise_hosts = !* +.endif # ----- Main settings ----- diff --git a/test/confs/0901 b/test/confs/0901 index a1f391613..361a9bf6c 100644 --- a/test/confs/0901 +++ b/test/confs/0901 @@ -17,6 +17,9 @@ tls_advertise_hosts = ${if eq {SRV}{tls} {*}} .ifdef _HAVE_DMARC dmarc_tld_file = .endif +.ifdef _OPT_MAIN_LIMITS_ADVERTISE_HOSTS +limits_advertise_hosts = !* +.endif pipelining_advertise_hosts = : diff --git a/test/confs/0906 b/test/confs/0906 index 5bd5f2a4f..57f359ff0 100644 --- a/test/confs/0906 +++ b/test/confs/0906 @@ -16,6 +16,9 @@ pipelining_connect_advertise_hosts = .ifdef _HAVE_DMARC dmarc_tld_file = .endif +.ifdef _EXP_LIMITS +limits_advertise_hosts = !* +.endif # ----- Main settings ----- diff --git a/test/confs/3414 b/test/confs/3414 index 5d0f93c46..25205a4c1 100644 --- a/test/confs/3414 +++ b/test/confs/3414 @@ -13,6 +13,9 @@ gecos_pattern = "" gecos_name = CALLER_NAME chunking_advertise_hosts = tls_advertise_hosts = +.ifdef _EXP_LIMITS +limits_advertise_hosts = !* +.endif # ----- Main settings ----- diff --git a/test/confs/4050 b/test/confs/4050 index c26b7a9c2..fd3d7db54 100644 --- a/test/confs/4050 +++ b/test/confs/4050 @@ -25,6 +25,9 @@ tls_advertise_hosts = .ifdef _HAVE_DMARC dmarc_tld_file = .endif +.ifdef _OPT_MAIN_LIMITS_ADVERTISE_HOSTS +limits_advertise_hosts = !* +.endif pipelining_connect_advertise_hosts = CONNECTCOND retry_data_expire = RETRY diff --git a/test/confs/4710 b/test/confs/4710 new file mode 100644 index 000000000..017fb56eb --- /dev/null +++ b/test/confs/4710 @@ -0,0 +1,36 @@ +# Exim test configuration 4710 +# + +exim_path = EXIM_PATH +keep_environment = USER +host_lookup_order = bydns +primary_hostname = myhost.test.ex +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME +tls_advertise_hosts = +.ifdef _HAVE_PIPE_CONNECT +pipelining_connect_advertise_hosts = : +.endif +.ifdef _HAVE_DMARC +dmarc_tld_file = +.endif + +# ----- Main settings ----- + +.ifdef CONTROL +limits_advertise_hosts = : +.endif +.ifdef MAXNM +smtp_accept_max_per_connection = ${if eq {127.0.0.1}{$sender_host_address} {MAXNM}{44}} +.endif +.ifdef RCPT_MSG +recipients_max = RCPT_MSG +.endif + +# ----- ACL ----- + +begin acl + +# End diff --git a/test/confs/4711 b/test/confs/4711 new file mode 100644 index 000000000..23f141d02 --- /dev/null +++ b/test/confs/4711 @@ -0,0 +1,31 @@ +# Exim test configuration 4711 + +.include DIR/aux-var/std_conf_prefix + + +# ----- Main settings ----- + +acl_smtp_rcpt = accept + +# ----- Routers ----- + +begin routers + +send_to_server: + driver = accept + transport = to_server + +# ----- Transports ----- + +begin transports + +to_server: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D +.ifdef RCPT_MSG + max_rcpt = RCPT_MSG +.endif + +# End diff --git a/test/confs/4712 b/test/confs/4712 new file mode 100644 index 000000000..c48be50dc --- /dev/null +++ b/test/confs/4712 @@ -0,0 +1,28 @@ +# Exim test configuration 4712 + +.include DIR/aux-var/std_conf_prefix + + +# ----- Main settings ----- + +acl_smtp_rcpt = accept + +# ----- Routers ----- + +begin routers + +send_to_server: + driver = accept + transport = to_server + +# ----- Transports ----- + +begin transports + +to_server: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + +# End diff --git a/test/confs/4713 b/test/confs/4713 new file mode 100644 index 000000000..c5394fb05 --- /dev/null +++ b/test/confs/4713 @@ -0,0 +1,31 @@ +# Exim test configuration 4711 + +.include DIR/aux-var/std_conf_prefix + + +# ----- Main settings ----- + +acl_smtp_rcpt = accept + +# ----- Routers ----- + +begin routers + +send_to_server: + driver = accept + transport = to_server + +# ----- Transports ----- + +begin transports + +to_server: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D +.ifdef CONTROL + multi_domain = false +.endif + +# End diff --git a/test/confs/4714 b/test/confs/4714 new file mode 100644 index 000000000..dd06bd8e5 --- /dev/null +++ b/test/confs/4714 @@ -0,0 +1,36 @@ +# Exim test configuration 4714 + +.include DIR/aux-var/std_conf_prefix + + +# ----- Main settings ----- + +log_selector = +received_recipients +queue_run_in_order + +acl_smtp_rcpt = accept + +# ----- Routers ----- + +begin routers + +send_to_server: + driver = accept + transport = to_server + +# ----- Transports ----- + +begin transports + +to_server: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + +# ----- Retry ----- + +begin retry +* * F,5d,10s + +# End diff --git a/test/confs/5670 b/test/confs/5670 index d4bedac51..f4252668e 100644 --- a/test/confs/5670 +++ b/test/confs/5670 @@ -32,11 +32,11 @@ tls_ocsp_file = PEM DIR/tmp/ocsp/double_r.ocsp.pem .ifdef _HAVE_GNUTLS -tls_require_ciphers = ${if eq {LIMIT}{TLS1.2} {NORMAL:!VERS-ALL:+VERS-TLS1.2} {}} +tls_require_ciphers = ${if eq {TRUSTED}{TLS1.2} {NORMAL:!VERS-ALL:+VERS-TLS1.2} {}} .endif .ifdef _HAVE_OPENSSL -.ifdef LIMIT -openssl_options = ${if eq {LIMIT}{TLS1.2} {+no_tlsv1_3} {}} +.ifdef TRUSTED +openssl_options = ${if eq {TRUSTED}{TLS1.2} {+no_tlsv1_3} {}} .endif .endif @@ -81,7 +81,7 @@ remote_delivery: hosts_require_tls = * .ifdef _HAVE_GNUTLS - tls_require_ciphers = ${if eq {LIMIT}{TLS1.2} \ + tls_require_ciphers = ${if eq {TRUSTED}{TLS1.2} \ {NONE:\ +SIGN-RSA-SHA256:+VERS-TLS-ALL:+ECDHE-RSA:+DHE-RSA:+RSA\ :+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509} \ diff --git a/test/log/4710 b/test/log/4710 new file mode 100644 index 000000000..6e70d69ad --- /dev/null +++ b/test/log/4710 @@ -0,0 +1,6 @@ +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/4711 b/test/log/4711 new file mode 100644 index 000000000..520ad1f97 --- /dev/null +++ b/test/log/4711 @@ -0,0 +1,24 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaX-0005vi-00 -> c@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaX-0005vi-00 -> d@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaX-0005vi-00 -> e@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => a@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 -> b@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 => c@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 -> d@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 => e@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaZ-0005vi-00 => a@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaZ-0005vi-00 -> b@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message received" +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbA-0005vi-00 => a@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmbA-0005vi-00 -> b@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmbA-0005vi-00 => c@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed diff --git a/test/log/4712 b/test/log/4712 new file mode 100644 index 000000000..8479516c1 --- /dev/null +++ b/test/log/4712 @@ -0,0 +1,8 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaX-0005vi-00 => b@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message received" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => a@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 => b@test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/4713 b/test/log/4713 new file mode 100644 index 000000000..09a56f3bf --- /dev/null +++ b/test/log/4713 @@ -0,0 +1,11 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => a@a.test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@b.test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => a@a.test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 => b@b.test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 second message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 => c@c.test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 third message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 -> a2@a.test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 -> b2@b.test.ex R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 second message received" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/4714 b/test/log/4714 new file mode 100644 index 000000000..f97d89f6c --- /dev/null +++ b/test/log/4714 @@ -0,0 +1,14 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for r1_1.test.ex r1_2.test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for r2_1.test.ex r2_2.test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss for r3_1.test.ex r3_2.test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp -qq +1999-03-02 09:44:33 10HmaX-0005vi-00 => r1_1.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message 1 received" +1999-03-02 09:44:33 10HmaX-0005vi-00 => r1_2.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message 2 received" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 => r3_1.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message 3 received" +1999-03-02 09:44:33 10HmaZ-0005vi-00 => r3_2.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message 4 received" +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 => r2_1.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1]* C="250 message 5 received" +1999-03-02 09:44:33 10HmaY-0005vi-00 => r2_2.test.ex@the.local.host.name R=send_to_server T=to_server H=127.0.0.1 [127.0.0.1] C="250 message 6 received" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qq diff --git a/test/runtest b/test/runtest index 8ebba5023..8f49b26d3 100755 --- a/test/runtest +++ b/test/runtest @@ -1020,6 +1020,9 @@ RESET_AFTER_EXTRA_LINE_READ: # ARC is not always supported by the build next if /^arc_sign =/; + # LIMITS is not always supported by the build + next if /^limits_advertise_hosts =/; + # TLS resumption is not always supported by the build next if /^tls_resumption_hosts =/; next if /^-tls_resumption/; @@ -1285,6 +1288,9 @@ RESET_AFTER_EXTRA_LINE_READ: # Experimental_REQUIRETLS next if / in tls_advertise_requiretls?\? no \(end of list\)/; + # Experimental_LIMITS + next if / in limits_advertise_hosts?\? no \(matched "!\*"\)/; + # TCP Fast Open next if /^(ppppp )?setsockopt FASTOPEN: Network Error/; diff --git a/test/scripts/0000-Basic/0453 b/test/scripts/0000-Basic/0453 index 8c199fe39..b07a7125c 100644 --- a/test/scripts/0000-Basic/0453 +++ b/test/scripts/0000-Basic/0453 @@ -9,7 +9,7 @@ helo helo **** 1 -exim -DLIMIT=smtp_max_synprot_errors=1 -bs +exim -DERROR_DETAILS=smtp_max_synprot_errors=1 -bs mail from:<> mail from:<> mail from:<> diff --git a/test/scripts/4710-esmtp-limits/4710 b/test/scripts/4710-esmtp-limits/4710 new file mode 100644 index 000000000..875613cab --- /dev/null +++ b/test/scripts/4710-esmtp-limits/4710 @@ -0,0 +1,86 @@ +# ESMTP LIMITS extension, server +# +# Baseline: advertised by default +exim -DSERVER=server -bd -oX PORT_D +**** +client 127.0.0.1 PORT_D +??? 220 +EHLO tester +??? 250- +??? 250-SIZE +??? 250-LIMITS MAILMAX=1000 +??? 250 +**** +killdaemon +# +# not advertised when disabled +exim -DSERVER=server -DCONTROL=disable -bd -oX PORT_D +**** +client 127.0.0.1 PORT_D +??? 220 +EHLO tester +??? 250- +??? 250-SIZE +??? 250-8BITMIME +**** +killdaemon +# +# smtp_accept_max_per_connection controls the MAILMAX value advertised, and is expanded +exim -DSERVER=server -DMAXNM=42 -bd -oX PORT_D +**** +client 127.0.0.1 PORT_D +??? 220 +EHLO tester +??? 250- +??? 250-SIZE +??? 250-LIMITS MAILMAX=42 +??? 250 +**** +client HOSTIPV4 PORT_D +??? 220 +EHLO tester +??? 250- +??? 250-SIZE +??? 250-LIMITS MAILMAX=44 +??? 250 +**** +killdaemon +# +# +# not advertised when zero and no RCPTMAX +exim -DSERVER=server -DMAXNM=0 -bd -oX PORT_D +**** +client 127.0.0.1 PORT_D +??? 220 +EHLO tester +??? 250- +??? 250-SIZE +??? 250 +**** +killdaemon +# +# reeipients_max controls an advertised RCPTMAX +exim -DSERVER=server -DRCPT_MSG=5 -bd -oX PORT_D +**** +client 127.0.0.1 PORT_D +??? 220 +EHLO tester +??? 250- +??? 250-SIZE +??? 250-LIMITS MAILMAX=1000 RCPTMAX=5 +??? 250 +**** +killdaemon +# +# RCPTMAX can appear on its own +exim -DSERVER=server -DMAXNM=0 -DRCPT_MSG=5 -bd -oX PORT_D +**** +client 127.0.0.1 PORT_D +??? 220 +EHLO tester +??? 250- +??? 250-SIZE +??? 250-LIMITS RCPTMAX=5 +??? 250 +**** +killdaemon diff --git a/test/scripts/4710-esmtp-limits/4711 b/test/scripts/4710-esmtp-limits/4711 new file mode 100644 index 000000000..ffbfa07d0 --- /dev/null +++ b/test/scripts/4710-esmtp-limits/4711 @@ -0,0 +1,138 @@ +# ESMTP LIMITS extension, client RCPTMAX +# +# Baseline: no RCPTMAX advertised, can send 5 RCPT commands +server PORT_D +220 Hi there +EHLO +250-yeah mate +250 LIMITS MAILMAX=10 +MAIL FROM +250 mail cmd good +RCPT TO +250 rcpt cmd 1 good +RCPT TO +250 rcpt cmd 2 good +RCPT TO +250 rcpt cmd 3 good +RCPT TO +250 rcpt cmd 4 good +RCPT TO +250 rcpt cmd 5 good +DATA +352 go ahead +. +250 message received +QUIT +220 bye +**** +exim -odi a@test.ex b@test.ex c@test.ex d@test.ex e@test.ex +**** +# +# RCPTMAX advertised, limits RCPT commands +# Client should immediate-retry fusther MAIL transaction for remaning rcpts +server PORT_D +220 Hi there +EHLO +250-yeah mate +250 LIMITS RCPTMAX=2 +MAIL FROM +250 mail cmd good +RCPT TO +250 rcpt cmd 1 good +RCPT TO +250 rcpt cmd 2 good +DATA +352 go ahead +. +250 message received +MAIL FROM +250 mail cmd good +RCPT TO +250 rcpt cmd 3 good +RCPT TO +250 rcpt cmd 4 good +DATA +352 go ahead +. +250 message received +MAIL FROM +250 mail cmd good +RCPT TO +250 rcpt cmd 5 good +DATA +352 go ahead +. +250 message received +QUIT +220 bye +**** +exim -odi a@test.ex b@test.ex c@test.ex d@test.ex e@test.ex +**** +# +# RCPTMAX advertised, overrides larger tpt max_rcpt and limits RCPT commands +server PORT_D +220 Hi there +EHLO +250-yeah mate +250 LIMITS RCPTMAX=2 +MAIL FROM +250 mail cmd good +RCPT TO +250 rcpt cmd 1 good +RCPT TO +250 rcpt cmd 2 good +DATA +352 go ahead +. +250 message received +MAIL FROM +250 mail cmd good +RCPT TO +250 rcpt cmd 3 good +DATA +352 go ahead +. +250 message received +QUIT +220 bye +**** +exim -odi -DRCPT_MSG=3 a@test.ex b@test.ex c@test.ex +**** +# +# RCPTMAX advertised, does not override smaller tpt max_rcpt which limits RCPT commands +# Client make a separate conn for the second transaction +server PORT_D 2 +220 Hi there +EHLO +250-yeah mate +250 LIMITS RCPTMAX=3 +MAIL FROM +250 mail cmd good +RCPT TO +250 rcpt cmd 1 good +RCPT TO +250 rcpt cmd 2 good +DATA +352 go ahead +. +250 message received +QUIT +220 bye +*eof +220 Hi there +EHLO +250-yeah mate +250 LIMITS RCPTMAX=3 +MAIL FROM +250 mail cmd good +RCPT TO +250 rcpt cmd 3 good +DATA +352 go ahead +. +250 message received +QUIT +220 bye +**** +exim -odi -DRCPT_MSG=2 a@test.ex b@test.ex c@test.ex +**** diff --git a/test/scripts/4710-esmtp-limits/4712 b/test/scripts/4710-esmtp-limits/4712 new file mode 100644 index 000000000..c5d1cab4e --- /dev/null +++ b/test/scripts/4710-esmtp-limits/4712 @@ -0,0 +1,65 @@ +# ESMTP LIMITS extension, client MAILMAX +# +# Baseline: no MAILMAX advertised, can send 2 messages +# - limiting the RCPT to 1 is convenient to get the multiple messages +server PORT_D +220 Hi there +EHLO +250-yeah mate +250 LIMITS RCPTMAX=1 +MAIL FROM +250 mail cmd 1 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message received +MAIL FROM +250 mail cmd 2 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message received +QUIT +220 bye +**** +exim -odi a@test.ex b@test.ex +**** +# +# limited to one MAIL per conn. Client should immediate-retry a second one. +server PORT_D 2 +220 Hi there +EHLO +250-yeah mate +250 LIMITS RCPTMAX=1 MAILMAX=1 +MAIL FROM +250 mail cmd 1 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message received +QUIT +220 bye +*eof +220 Hi there +EHLO +250-yeah mate +250 LIMITS RCPTMAX=1 MAILMAX=1 +MAIL FROM +250 mail cmd 2 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message received +QUIT +220 bye +**** +exim -odi a@test.ex b@test.ex +**** diff --git a/test/scripts/4710-esmtp-limits/4713 b/test/scripts/4710-esmtp-limits/4713 new file mode 100644 index 000000000..6003f2729 --- /dev/null +++ b/test/scripts/4710-esmtp-limits/4713 @@ -0,0 +1,64 @@ +# ESMTP LIMITS extension, client RCPTDOMAINMAX Limit +# +# Baseline: no RCPTDOMAINMAX Limit advertised, can send RCPT commands with distinct domains +server PORT_D +220 Hi there +EHLO +250-yeah mate +250 LIMITS MAILMAX=10 +MAIL FROM +250 mail cmd good +RCPT TO +250 rcpt cmd 1 good +RCPT TO +250 rcpt cmd 2 good +DATA +352 go ahead +. +250 message received +QUIT +220 bye +**** +exim -odi a@a.test.ex b@b.test.ex +**** +# +# RCPTDOMAINMAX Limit advertised, second domain temp-rejected +# Client should immediate-retry further MAIL transactions for remaining rcpts +server PORT_D +220 Hi there +EHLO +250-yeah mate +250 LIMITS MAILMAX=10 RCPTDOMAINMAX=100 +MAIL FROM +250 mail cmd good +RCPT TO:<a@a.test.ex> +250 rcpt cmd 1 good +RCPT TO:<a2@a.test.ex> +250 rcpt cmd 2 good +DATA +352 go ahead +. +250 message received +MAIL FROM +250 second mail cmd good +RCPT TO:<b@b.test.ex> +250 rcpt cmd 1 good +RCPT TO +250 rcpt cmd 2 good +DATA +352 go ahead +. +250 second message received +MAIL FROM +250 third mail cmd good +RCPT TO:<c@c.test.ex> +250 rcpt cmd 1 good +DATA +352 go ahead +. +250 third message received +QUIT +220 bye +**** +exim -odi a@a.test.ex b@b.test.ex c@c.test.ex a2@a.test.ex b2@b.test.ex +**** diff --git a/test/scripts/4710-esmtp-limits/4714 b/test/scripts/4710-esmtp-limits/4714 new file mode 100644 index 000000000..f97d989e8 --- /dev/null +++ b/test/scripts/4710-esmtp-limits/4714 @@ -0,0 +1,84 @@ +# ESMTP LIMITS extension, client continued-connection +# +# queue up 3 messages each with 2 recipients +exim -odq r1_1.test.ex r1_2.test.ex +Subject: message 1 +**** +exim -odq r2_1.test.ex r2_2.test.ex +Subject: message 2 +**** +exim -odq r3_1.test.ex r3_2.test.ex +Subject: message 3 +**** +# +# Handed limits of 5 MAIL, 1 RCPT, expect to use 5 transactions in a one connection +# when the client does a 2-phase queue run, followed by one transaction in one connection +# from the same queue run. +# The second pair and third initial should be from continued-connection trasports, flagged by the log lines. +server PORT_D 2 +220 Hi there +EHLO +250-yeah mate +250 LIMITS MAILMAX=5 RCPTMAX=1 +MAIL FROM +250 mail cmd 1 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message 1 received +MAIL FROM +250 mail cmd 2 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message 2 received +MAIL FROM +250 mail cmd 3 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message 3 received +MAIL FROM +250 mail cmd 4 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message 4 received +MAIL FROM +250 mail cmd 5 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message 5 received +QUIT +221 bye +*eof +220 Hi there +EHLO +250-yeah mate +250 +MAIL FROM +250 mail cmd 1 good +RCPT TO +250 rcpt cmd good +DATA +352 go ahead +. +250 message 6 received +QUIT +221 bye +*eof +**** +# +exim -qq +**** diff --git a/test/scripts/4710-esmtp-limits/REQUIRES b/test/scripts/4710-esmtp-limits/REQUIRES new file mode 100644 index 000000000..4817265b8 --- /dev/null +++ b/test/scripts/4710-esmtp-limits/REQUIRES @@ -0,0 +1 @@ +support Experimental_ESMTP_Limits diff --git a/test/scripts/5670-OCSP-GnuTLS-1.3/5670 b/test/scripts/5670-OCSP-GnuTLS-1.3/5670 index 1df75fbf9..1ff6d8161 100644 --- a/test/scripts/5670-OCSP-GnuTLS-1.3/5670 +++ b/test/scripts/5670-OCSP-GnuTLS-1.3/5670 @@ -14,10 +14,10 @@ system 'cat server1.example.com/server1.example.com.ocsp.signernocert.good.resp. exim -z '1: TLS1.2 Server sends good leaf-staple on request, to client requiring RSA auth' **** # -sudo exim -bd -oX PORT_D -DSERVER=server -DLIMIT=TLS1.2 +sudo exim -bd -oX PORT_D -DSERVER=server -DTRUSTED=TLS1.2 **** # -exim -odf -DOPT=rsa -DLIMIT=TLS1.2 rsa.auth@test.ex +exim -odf -DOPT=rsa -DTRUSTED=TLS1.2 rsa.auth@test.ex Subject: test . @@ -29,7 +29,7 @@ exim -z '2: TLS1.3 Server sends good 3-element staple on request, to client requ **** # # Prefix with sudo to get SSLKEYLOGFILE to work. Only works on the server. -exim -bd -oX PORT_D -DSERVER=server -DLIMIT=TLS1.3 +exim -bd -oX PORT_D -DSERVER=server -DTRUSTED=TLS1.3 **** exim -odf -DOPT=rsa rsa.auth@test.ex Subject: test @@ -43,7 +43,7 @@ killdaemon exim -z '3: TLS1.3 Server sends bad nonleaf staple, client detects it' **** # -EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server -DLIMIT=TLS1.3 -DCONTROL=bad +EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server -DTRUSTED=TLS1.3 -DCONTROL=bad **** exim -odf -DOPT=rsa rsa.auth@test.ex Subject: test diff --git a/test/stdout/4710 b/test/stdout/4710 new file mode 100644 index 000000000..35a51c450 --- /dev/null +++ b/test/stdout/4710 @@ -0,0 +1,87 @@ +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO tester +??? 250- +<<< 250-myhost.test.ex Hello tester [127.0.0.1] +??? 250-SIZE +<<< 250-SIZE 52428800 +??? 250-LIMITS MAILMAX=1000 +<<< 250-LIMITS MAILMAX=1000 +??? 250 +<<< 250-8BITMIME +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO tester +??? 250- +<<< 250-myhost.test.ex Hello tester [127.0.0.1] +??? 250-SIZE +<<< 250-SIZE 52428800 +??? 250-8BITMIME +<<< 250-8BITMIME +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO tester +??? 250- +<<< 250-myhost.test.ex Hello tester [127.0.0.1] +??? 250-SIZE +<<< 250-SIZE 52428800 +??? 250-LIMITS MAILMAX=42 +<<< 250-LIMITS MAILMAX=42 +??? 250 +<<< 250-8BITMIME +End of script +Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO tester +??? 250- +<<< 250-myhost.test.ex Hello tester [ip4.ip4.ip4.ip4] +??? 250-SIZE +<<< 250-SIZE 52428800 +??? 250-LIMITS MAILMAX=44 +<<< 250-LIMITS MAILMAX=44 +??? 250 +<<< 250-8BITMIME +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO tester +??? 250- +<<< 250-myhost.test.ex Hello tester [127.0.0.1] +??? 250-SIZE +<<< 250-SIZE 52428800 +??? 250 +<<< 250-8BITMIME +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO tester +??? 250- +<<< 250-myhost.test.ex Hello tester [127.0.0.1] +??? 250-SIZE +<<< 250-SIZE 52428800 +??? 250-LIMITS MAILMAX=1000 RCPTMAX=5 +<<< 250-LIMITS MAILMAX=1000 RCPTMAX=5 +??? 250 +<<< 250-8BITMIME +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> EHLO tester +??? 250- +<<< 250-myhost.test.ex Hello tester [127.0.0.1] +??? 250-SIZE +<<< 250-SIZE 52428800 +??? 250-LIMITS RCPTMAX=5 +<<< 250-LIMITS RCPTMAX=5 +??? 250 +<<< 250-8BITMIME +End of script diff --git a/test/stdout/4711 b/test/stdout/4711 new file mode 100644 index 000000000..78b5203d4 --- /dev/null +++ b/test/stdout/4711 @@ -0,0 +1,183 @@ + +******** SERVER ******** +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS MAILMAX=10 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<a@test.ex> +250 rcpt cmd 1 good +RCPT TO:<b@test.ex> +250 rcpt cmd 2 good +RCPT TO:<c@test.ex> +250 rcpt cmd 3 good +RCPT TO:<d@test.ex> +250 rcpt cmd 4 good +RCPT TO:<e@test.ex> +250 rcpt cmd 5 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +QUIT +220 bye +End of script +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS RCPTMAX=2 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<a@test.ex> +250 rcpt cmd 1 good +RCPT TO:<b@test.ex> +250 rcpt cmd 2 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<c@test.ex> +250 rcpt cmd 3 good +RCPT TO:<d@test.ex> +250 rcpt cmd 4 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<e@test.ex> +250 rcpt cmd 5 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +QUIT +220 bye +End of script +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS RCPTMAX=2 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<a@test.ex> +250 rcpt cmd 1 good +RCPT TO:<b@test.ex> +250 rcpt cmd 2 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<c@test.ex> +250 rcpt cmd 3 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +QUIT +220 bye +End of script +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS RCPTMAX=3 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<a@test.ex> +250 rcpt cmd 1 good +RCPT TO:<b@test.ex> +250 rcpt cmd 2 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbA-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +QUIT +220 bye +Expected EOF read from client +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS RCPTMAX=3 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<c@test.ex> +250 rcpt cmd 3 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbA-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +QUIT +220 bye +End of script diff --git a/test/stdout/4712 b/test/stdout/4712 new file mode 100644 index 000000000..69be8af64 --- /dev/null +++ b/test/stdout/4712 @@ -0,0 +1,89 @@ + +******** SERVER ******** +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS RCPTMAX=1 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 1 good +RCPT TO:<a@test.ex> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 2 good +RCPT TO:<b@test.ex> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +QUIT +220 bye +End of script +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS RCPTMAX=1 MAILMAX=1 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 1 good +RCPT TO:<a@test.ex> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +QUIT +220 bye +Expected EOF read from client +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS RCPTMAX=1 MAILMAX=1 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 2 good +RCPT TO:<b@test.ex> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +QUIT +220 bye +End of script diff --git a/test/stdout/4713 b/test/stdout/4713 new file mode 100644 index 000000000..02b10ea77 --- /dev/null +++ b/test/stdout/4713 @@ -0,0 +1,86 @@ + +******** SERVER ******** +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS MAILMAX=10 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<a@a.test.ex> +250 rcpt cmd 1 good +RCPT TO:<b@b.test.ex> +250 rcpt cmd 2 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +QUIT +220 bye +End of script +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS MAILMAX=10 RCPTDOMAINMAX=100 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd good +RCPT TO:<a@a.test.ex> +250 rcpt cmd 1 good +RCPT TO:<a2@a.test.ex> +250 rcpt cmd 2 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message received +MAIL FROM:<CALLER@the.local.host.name> +250 second mail cmd good +RCPT TO:<b@b.test.ex> +250 rcpt cmd 1 good +RCPT TO:<b2@b.test.ex> +250 rcpt cmd 2 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 second message received +MAIL FROM:<CALLER@the.local.host.name> +250 third mail cmd good +RCPT TO:<c@c.test.ex> +250 rcpt cmd 1 good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 third message received +QUIT +220 bye +End of script diff --git a/test/stdout/4714 b/test/stdout/4714 new file mode 100644 index 000000000..f7d8e221e --- /dev/null +++ b/test/stdout/4714 @@ -0,0 +1,117 @@ + +******** SERVER ******** +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 LIMITS MAILMAX=5 RCPTMAX=1 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 1 good +RCPT TO:<r1_1.test.ex@the.local.host.name> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Subject: message 1 +Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message 1 received +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 2 good +RCPT TO:<r1_2.test.ex@the.local.host.name> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Subject: message 1 +Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message 2 received +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 3 good +RCPT TO:<r3_1.test.ex@the.local.host.name> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Subject: message 3 +Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message 3 received +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 4 good +RCPT TO:<r3_2.test.ex@the.local.host.name> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Subject: message 3 +Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message 4 received +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 5 good +RCPT TO:<r2_1.test.ex@the.local.host.name> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Subject: message 2 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message 5 received +QUIT +221 bye +Expected EOF read from client +Listening on port 1225 ... +Connection request from [127.0.0.1] +220 Hi there +EHLO the.local.host.name +250-yeah mate +250 +MAIL FROM:<CALLER@the.local.host.name> +250 mail cmd 1 good +RCPT TO:<r2_2.test.ex@the.local.host.name> +250 rcpt cmd good +DATA +352 go ahead +Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@the.local.host.name>) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Subject: message 2 +Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +From: CALLER_NAME <CALLER@the.local.host.name> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 message 6 received +QUIT +221 bye +Expected EOF read from client +End of script |