diff options
Diffstat (limited to 'test')
88 files changed, 672 insertions, 326 deletions
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem new file mode 100644 index 000000000..9667e069c --- /dev/null +++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem @@ -0,0 +1,52 @@ +OCSP Response Information: + Response Status: Successful + Response Type: Basic OCSP Response + Version: 1 + Responder ID: CN=clica CA rsa,O=example.com + Produced At: Thu Oct 10 20:08:22 UTC 2019 + Responses: + Certificate ID: + Hash Algorithm: SHA256 + Issuer Name Hash: 5af082e51d62fe01fd706baebeb878db64e68f76e74a36f36d914297ddee24b8 + Issuer Key Hash: 333db14364b98e78a33dd8a4fae8d8378ea9b0f5fbca97b25685aa0d32116091 + Serial Number: 65 + Certificate Status: good + This Update: Thu Oct 10 20:08:22 UTC 2019 + Next Update: Tue Oct 09 20:08:22 UTC 2029 + Certificate ID: + Hash Algorithm: SHA256 + Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109 + Issuer Key Hash: 208f9d28c7c0bc914144dfa8c0be3d5b3bfcebb622c8a8dc27e865fc06ca0e12 + Serial Number: 42 + Certificate Status: good + This Update: Thu Oct 10 20:08:22 UTC 2019 + Next Update: Tue Oct 09 20:08:22 UTC 2029 + Certificate ID: + Hash Algorithm: SHA256 + Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109 + Issuer Key Hash: 208f9d28c7c0bc914144dfa8c0be3d5b3bfcebb622c8a8dc27e865fc06ca0e12 + Serial Number: 41 + Certificate Status: good + This Update: Thu Oct 10 20:08:22 UTC 2019 + Next Update: Tue Oct 09 20:08:22 UTC 2029 + Extensions: + Signature Algorithm: RSA-SHA256 + +-----BEGIN OCSP RESPONSE----- +MIIC/AoBAKCCAvUwggLxBgkrBgEFBQcwAQEEggLiMIIC3jCCAcahLzAtMRQwEgYD +VQQKEwtleGFtcGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhGA8yMDE5MTAx +MDIwMDgyMlowggGAMH4wVjANBglghkgBZQMEAgEFAAQgWvCC5R1i/gH9cGuuvrh4 +22Tmj3bnSjbzbZFCl93uJLgEIDM9sUNkuY54oz3YpPro2DeOqbD1+8qXslaFqg0y +EWCRAgFlgAAYDzIwMTkxMDEwMjAwODIyWqARGA8yMDI5MTAwOTIwMDgyMlowfjBW +MA0GCWCGSAFlAwQCAQUABCC/pydaVm79S+LfgtvZ0SkNRwGG9v8qzYwWZZ80KrVh +CQQgII+dKMfAvJFBRN+owL49Wzv867YiyKjcJ+hl/AbKDhICAUKAABgPMjAxOTEw +MTAyMDA4MjJaoBEYDzIwMjkxMDA5MjAwODIyWjB+MFYwDQYJYIZIAWUDBAIBBQAE +IL+nJ1pWbv1L4t+C29nRKQ1HAYb2/yrNjBZlnzQqtWEJBCAgj50ox8C8kUFE36jA +vj1bO/zrtiLIqNwn6GX8BsoOEgIBQYAAGA8yMDE5MTAxMDIwMDgyMlqgERgPMjAy +OTEwMDkyMDA4MjJaMA0GCSqGSIb3DQEBCwUAA4IBAQBm8uLIawRny88oLSzr7sxj +IgGjhC+S2OXWjAlTxErHoEsJ0JPKkQAt/s5YLy4IKiPbCg6CIm9KotgE4vnpMFjg +297pSrdYKdtb2iBPKq5afB2Iv6ET78L/j2HhBFyJaxlt6lhI0Ly6JE75IbUrdP24 +c5uIh+KpJaC60bTZehgcRnrw9fR7HJ5W9ln9mbOZDggNQeM9hmFLUmQYPQWxav2x +IjCYAZOfIp8ficETnLhuDuILsohFRnQnFAaf1YTgvW2zoKLMeLUWzMm8a6IoBpXQ +0ecpPJs2FFiaYL78EcRNN47YbClcfDQRAjTvlSZupk59YuxedlwiH6uc7Cwa3RnN +-----END OCSP RESPONSE----- diff --git a/test/aux-fixed/exim-ca/genall b/test/aux-fixed/exim-ca/genall index 8efda889f..6998108b0 100755 --- a/test/aux-fixed/exim-ca/genall +++ b/test/aux-fixed/exim-ca/genall @@ -75,12 +75,6 @@ do #### - # so, for full-chain OCSP we sill want an OCSP resp for the Signer cert and also (?) one for the - # CA cert itself. The existing bits below only create for the leaf certs, next layer down. - # - # First test will be just adding OCSP for the Signer cert. Presumably we could use the CA cert - # to sign that. - # create OCSP reqs & resps CADIR=$idir/CA @@ -160,11 +154,11 @@ EOF done # convert one good leaf-resp to PEM - $server=server1 + server=server1 RESP=$idir/$server.$iname/$server.$iname.ocsp.signernocert.good.resp ocsptool -S $RESP -j > $RESP.pem - # Then, ocsp request and responses for the signer cert + # Then, ocsp request and (valid, revoked) responses for the signer cert REQ=$CADIR/Signer.ocsp.req RESP=$CADIR/Signer.ocsp.signernocert.good.resp openssl ocsp -issuer $CADIR/CA.pem -sha256 -cert $CADIR/Signer.pem -no_nonce -reqout $REQ @@ -177,11 +171,18 @@ EOF -ndays 3652 -reqin $REQ -respout $RESP ocsptool -S $RESP -j > $RESP.pem - # Then, ocsp request and response for the CA cert - REQ=$CADIR/CA.ocsp.req - RESP=$CADIR/CA.ocsp.signernocert.good.resp - openssl ocsp -issuer $CADIR/CA.pem -sha256 -cert $CADIR/CA.pem -no_nonce -reqout $REQ - openssl ocsp $IVALID -rsigner $CADIR/CA.pem -rkey $CADIR/CA.key -CA $CADIR/CA.pem -resp_no_certs -noverify \ + # Finally, a full-chain all-good request and response + REQ=$idir/$server.$iname/fullchain.ocsp.req + leafcert=$idir/$server.$iname/$server.$iname.pem + signercert=$CADIR/Signer.pem + cacert=$CADIR/CA.pem + openssl ocsp -sha256 -no_nonce -reqout $REQ \ + -issuer $signercert -cert $leafcert \ + -issuer $cacert -cert $CADIR/Signer.pem -cert $CADIR/CA.pem + + RESP=$idir/$server.$iname/fullchain.ocsp.resp + authorities=$idir/$server.$iname/ca_chain.pem + openssl ocsp $IVALID -rsigner $CADIR/CA.pem -rkey $CADIR/CA.key -CA $authorities -resp_no_certs -noverify \ -ndays 3652 -reqin $REQ -respout $RESP ocsptool -S $RESP -j > $RESP.pem diff --git a/test/aux-var-src/tls_conf_prefix b/test/aux-var-src/tls_conf_prefix index ad9501ed0..541817668 100644 --- a/test/aux-var-src/tls_conf_prefix +++ b/test/aux-var-src/tls_conf_prefix @@ -1,4 +1,5 @@ -keep_environment = PATH:SSLKEYLOGFILE:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +add_environment = SSLKEYLOGFILE=DIR/spool/sslkeys exim_path = EXIM_PATH host_lookup_order = bydns spool_directory = DIR/spool diff --git a/test/confs/0206 b/test/confs/0206 index 628d2ec4d..7b3180dec 100644 --- a/test/confs/0206 +++ b/test/confs/0206 @@ -7,8 +7,8 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- -ignore_bounce_errors_after = 2s -timeout_frozen_after = 5s +ignore_bounce_errors_after = 4s +timeout_frozen_after = 10s queue_run_in_order diff --git a/test/confs/0618 b/test/confs/0618 index 7359e1633..b92353397 100644 --- a/test/confs/0618 +++ b/test/confs/0618 @@ -11,7 +11,7 @@ primary_hostname = myhost.test.ex .ifdef OPT dsn_advertise_hosts = * .endif -delay_warning = 3s : 24h +delay_warning = 6s : 24h accept_8bitmime = false pipelining_advertise_hosts = : @@ -90,5 +90,5 @@ tofile: begin retry -* * F,1m,3s +* * F,2m,10s # End diff --git a/test/confs/1023 b/test/confs/1023 new file mode 120000 index 000000000..2478c955e --- /dev/null +++ b/test/confs/1023 @@ -0,0 +1 @@ +1003
\ No newline at end of file diff --git a/test/confs/5602 b/test/confs/5602 deleted file mode 120000 index 4602aa558..000000000 --- a/test/confs/5602 +++ /dev/null @@ -1 +0,0 @@ -5652
\ No newline at end of file diff --git a/test/confs/5612 b/test/confs/5612 new file mode 120000 index 000000000..7d60415e2 --- /dev/null +++ b/test/confs/5612 @@ -0,0 +1 @@ +5665
\ No newline at end of file diff --git a/test/confs/5615 b/test/confs/5615 new file mode 120000 index 000000000..a21fc1bc9 --- /dev/null +++ b/test/confs/5615 @@ -0,0 +1 @@ +5670
\ No newline at end of file diff --git a/test/confs/5652 b/test/confs/5665 index 673ec6656..673ec6656 100644 --- a/test/confs/5652 +++ b/test/confs/5665 diff --git a/test/confs/5655 b/test/confs/5670 index 0f6fe1b98..6fbd7c12a 100644 --- a/test/confs/5655 +++ b/test/confs/5670 @@ -1,5 +1,5 @@ # Exim test configuration 5655 -# OCSP stapling, server, multiple chain-element OCSP +# OCSP stapling, server, multiple chain-element OCSP. Both GnuTLS and OpenSSL. .include DIR/aux-var/tls_conf_prefix @@ -7,7 +7,6 @@ primary_hostname = server1.example.com # ----- Main settings ----- -acl_smtp_connect = accept logwrite = ${env {SSLKEYLOGFILE}} acl_smtp_mail = check_mail acl_smtp_rcpt = check_recipient @@ -22,23 +21,24 @@ CADIR = DIR/aux-fixed/exim-ca DRSA = CADIR/example.com DECDSA = CADIR/example_ec.com -tls_certificate = DRSA/server1.example.com/fullchain.pem \ - : DECDSA/server1.example_ec.com/server1.example_ec.com.pem -tls_privatekey = DRSA/server1.example.com/server1.example.com.unlocked.key \ - : DECDSA/server1.example_ec.com/server1.example_ec.com.unlocked.key +tls_certificate = DRSA/server1.example.com/fullchain.pem +tls_privatekey = DRSA/server1.example.com/server1.example.com.unlocked.key .ifndef CONTROL -tls_ocsp_file = PEM DIR/tmp/ocsp/triple.ocsp.pem \ - : DER DECDSA/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp +tls_ocsp_file = PEM DRSA/server1.example.com/fullchain.ocsp.resp.pem .else -tls_ocsp_file = PEM DIR/tmp/ocsp/double_r.ocsp.pem \ - : DER DECDSA/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp +tls_ocsp_file = PEM DIR/tmp/ocsp/double_r.ocsp.pem .endif .ifdef _HAVE_GNUTLS tls_require_ciphers = ${if eq {LIMIT}{TLS1.2} {NORMAL:!VERS-ALL:+VERS-TLS1.2} {}} .endif +.ifdef _HAVE_OPENSSL +.ifdef LIMIT +openssl_options = ${if eq {LIMIT}{TLS1.2} {+no_tlsv1_3} {}} +.endif +.endif # ------ ACL ------ @@ -79,21 +79,18 @@ remote_delivery: driver = smtp port = PORT_D hosts_require_tls = * -.ifdef _HAVE_GNUTLS +.ifdef _HAVE_GNUTLS tls_require_ciphers = ${if eq {LIMIT}{TLS1.2} \ {NONE:\ - ${if eq {OPT}{rsa} \ - {+SIGN-RSA-SHA256:+VERS-TLS-ALL:+ECDHE-RSA:+DHE-RSA:+RSA} \ - {+SIGN-ECDSA-SHA512:+VERS-TLS-ALL:+KX-ALL}}\ + +SIGN-RSA-SHA256:+VERS-TLS-ALL:+ECDHE-RSA:+DHE-RSA:+RSA\ :+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509} \ {}} - tls_verify_certificates = CADIR/\ - ${if eq {OPT}{rsa} \ - {example.com/server1.example.com} \ - {example_ec.com/server1.example_ec.com}}\ - /ca_chain.pem .endif +.ifdef _HAVE_OPENSSL + tls_require_ciphers = RSA +.endif + tls_verify_certificates = CADIR/example.com/server1.example.com/ca_chain.pem hosts_require_ocsp = * tls_verify_cert_hostnames = : diff --git a/test/dnszones-src/db.kitterman.org b/test/dnszones-src/db.kitterman.org new file mode 100644 index 000000000..bc4e19c7f --- /dev/null +++ b/test/dnszones-src/db.kitterman.org @@ -0,0 +1,30 @@ +; This is a testing zone file for use when testing DNS handling in Exim. This +; is a fake zone of no real use. The zone name is +; test.ex. This file is passed through the substitution mechanism before being +; used by the fakens auxiliary program. This inserts the actual IP addresses +; of the local host into the zone. + +; NOTE (1): apart from ::1, IPv6 addresses must always have 8 components. Do +; not abbreviate them by using the :: feature. Leading zeros in components may, +; however, be omitted. + +; NOTE (2): the fakens program is very simple and assumes that the buffer into +; which is puts the response is always going to be big enough. In other words, +; the expectation is for just a few RRs for each query. + +; NOTE (3): the top-level networks for testing addresses are parameterized by +; the use of V4NET and V6NET. These networks should be such that no real +; host ever uses them. +; +; Several prefixes may be used, see the source in src/fakens.c for a complete list +; and description. + +kitterman.org. NS exim.kitterman.org. +kitterman.org. SOA exim.kitterman.org. hostmaster.exim.kitterman.org 1430683638 1200 120 604800 3000 + +; Record copied 2019/10/22 + +ed25519._domainkey TXT "v=DKIM1; k=ed25519; p=yi50DjK5O9pqbFpNHklsv9lqaS0ArSYu02qp1S0DW1Y=" + + +; End diff --git a/test/log/0576 b/test/log/0576 index 8c1cb73df..246b10578 100644 --- a/test/log/0576 +++ b/test/log/0576 @@ -20,6 +20,14 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 => alternate <alternate@test.ex> F=<CALLER@the.local.host.name> R=all T=dump 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 using queue '' +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex +1999-03-02 09:44:33 using queue 'alternate' +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=alternate for alternate@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 moved from input, msglog to (third) input, msglog +1999-03-02 09:44:33 10HmbC-0005vi-00 moved from (alternate) input, msglog to (third) input, msglog +1999-03-02 09:44:33 10HmbB-0005vi-00 moved from (third) input, msglog to input, msglog +1999-03-02 09:44:33 10HmbC-0005vi-00 moved from (third) input, msglog to input, msglog ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -qGlowpri/3s, not listening for SMTP diff --git a/test/log/0618 b/test/log/0618 index a572e11f3..ad992d9a2 100644 --- a/test/log/0618 +++ b/test/log/0618 @@ -56,21 +56,9 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 playout 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:connect -1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:connect -1999-03-02 09:44:33 10HmbB-0005vi-00 event smtp:ehlo -1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:rcpt:host:defer -1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:rcpt:defer -1999-03-02 09:44:33 10HmbB-0005vi-00 event tcp:close -1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@test.ex R=r2 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_defer@test.ex>: 451 Temporary local problem - please try later +1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@test.ex routing defer (-51): retry time not reached 1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for c@dump.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:connect -1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:connect -1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:ehlo -1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:rcpt:host:defer -1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:rcpt:defer -1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:close -1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@test.ex R=r2 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<rmt_defer@test.ex>: 451 Temporary local problem - please try later +1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@test.ex routing defer (-51): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:fail:internal 1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:complete @@ -112,7 +100,5 @@ 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<c@dump.ex> temporarily rejected RCPT <rmt_defer@test.ex> 1999-03-02 09:44:33 10HmbC-0005vi-00 <= d@dump.ex H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_defer@test.ex 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<d@dump.ex> temporarily rejected RCPT <rmt_defer@test.ex> -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<c@dump.ex> temporarily rejected RCPT <rmt_defer@test.ex> -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<d@dump.ex> temporarily rejected RCPT <rmt_defer@test.ex> 1999-03-02 09:44:33 10HmbE-0005vi-00 <= e@dump.ex H=(testclient) [ip4.ip4.ip4.ip4] P=esmtp S=sss for rmt_reject@test.ex 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<e@dump.ex> rejected RCPT <rmt_reject@test.ex> diff --git a/test/log/0904 b/test/log/0904 index 28c972b5d..0ca872075 100644 --- a/test/log/0904 +++ b/test/log/0904 @@ -14,30 +14,34 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for e@test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 400 not right now 1999-03-02 09:44:33 10HmbB-0005vi-00 == e@test.ex R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 400 not right now -1999-03-02 09:44:33 10HmbC-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for p@test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 => p@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" +1999-03-02 09:44:33 10HmbC-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for ebad@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 ** ebad@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<ebad@test.ex>: 550 sorry, no +1999-03-02 09:44:33 10HmbC-0005vi-00 ebad@test.ex: error ignored 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 10HmbD-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for q@test.ex -1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined end of data (ddd bytes written): Connection timed out -1999-03-02 09:44:33 10HmbD-0005vi-00 == q@test.ex R=to_server T=remote_smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined end of data (ddd bytes written) -1999-03-02 09:44:33 10HmbE-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for r@test.ex -1999-03-02 09:44:33 10HmbE-0005vi-00 => r@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" -1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 10HmbF-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for s@test.ex -1999-03-02 09:44:33 10HmbF-0005vi-00 ** s@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 550 unacceptable mail-from -1999-03-02 09:44:33 10HmbF-0005vi-00 s@test.ex: error ignored +1999-03-02 09:44:33 10HmbD-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for p@test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 => p@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" +1999-03-02 09:44:33 10HmbD-0005vi-00 Completed +1999-03-02 09:44:33 10HmbE-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for q@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined end of data (ddd bytes written): Connection timed out +1999-03-02 09:44:33 10HmbE-0005vi-00 == q@test.ex R=to_server T=remote_smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after pipelined end of data (ddd bytes written) +1999-03-02 09:44:33 10HmbF-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for r@test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 => r@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250 OK bdat" 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 10HmbG-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for s1@test.ex -1999-03-02 09:44:33 10HmbG-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 450 greylisted mail-from -1999-03-02 09:44:33 10HmbG-0005vi-00 == s1@test.ex R=to_server T=remote_smtp defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 450 greylisted mail-from -1999-03-02 09:44:33 10HmbH-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for t@test.ex -1999-03-02 09:44:33 10HmbH-0005vi-00 ** t@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<t@test.ex>: 550 no such recipient -1999-03-02 09:44:33 10HmbH-0005vi-00 t@test.ex: error ignored -1999-03-02 09:44:33 10HmbH-0005vi-00 Completed -1999-03-02 09:44:33 10HmbI-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for u@test.ex -1999-03-02 09:44:33 10HmbI-0005vi-00 ** u@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 500 oops bdat -1999-03-02 09:44:33 10HmbI-0005vi-00 u@test.ex: error ignored +1999-03-02 09:44:33 10HmbG-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for s@test.ex +1999-03-02 09:44:33 10HmbG-0005vi-00 ** s@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 550 unacceptable mail-from +1999-03-02 09:44:33 10HmbG-0005vi-00 s@test.ex: error ignored +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed +1999-03-02 09:44:33 10HmbH-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for s1@test.ex +1999-03-02 09:44:33 10HmbH-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 450 greylisted mail-from +1999-03-02 09:44:33 10HmbH-0005vi-00 == s1@test.ex R=to_server T=remote_smtp defer (-45) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 450 greylisted mail-from +1999-03-02 09:44:33 10HmbI-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for t@test.ex +1999-03-02 09:44:33 10HmbI-0005vi-00 ** t@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<t@test.ex>: 550 no such recipient +1999-03-02 09:44:33 10HmbI-0005vi-00 t@test.ex: error ignored 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed -1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for v@test.ex -1999-03-02 09:44:33 10HmbJ-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat -1999-03-02 09:44:33 10HmbJ-0005vi-00 == v@test.ex R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat +1999-03-02 09:44:33 10HmbJ-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for u@test.ex +1999-03-02 09:44:33 10HmbJ-0005vi-00 ** u@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 500 oops bdat +1999-03-02 09:44:33 10HmbJ-0005vi-00 u@test.ex: error ignored +1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbK-0005vi-00 <= sender@source.dom U=root P=local-bsmtp S=sss for v@test.ex +1999-03-02 09:44:33 10HmbK-0005vi-00 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat +1999-03-02 09:44:33 10HmbK-0005vi-00 == v@test.ex R=to_server T=remote_smtp defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 400 not right now bdat diff --git a/test/log/1003 b/test/log/1003 index 2ecb76664..4dc4d637c 100644 --- a/test/log/1003 +++ b/test/log/1003 @@ -1,25 +1,21 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaY-0005vi-00 => user4@h1.test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 => user4@h1.test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 => user6@h2.test.ex R=client T=send_to_server2 H=::1 [::1] C="250 OK id=10HmbD-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 => user6@h3.test.ex R=client T=send_to_server3 H=::1 [::1] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 => user6@h3.test.ex R=client T=send_to_server3 H=::1 [::1] C="250 OK id=10HmbE-0005vi-00" +1999-03-02 09:44:33 10HmbA-0005vi-00 => user6@h4.test.ex R=client T=send_to_server4 H=::1 [::1] C="250 OK id=10HmbD-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 => user6@h4.test.ex R=client T=send_to_server4 H=::1 [::1] C="250 OK id=10HmbF-0005vi-00" -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 == user6@h5.test.ex R=client T=send_to_server5 defer (-1): failed to expand "interface" option for send_to_server5 transport: condition name expected, but found "" 1999-03-02 09:44:33 End queue run: pid=pppp -qf ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 no host name found for IP address ::1 -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [::1] P=esmtp S=sss id=E10HmbA-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [::1] P=esmtp S=sss id=E10HmaZ-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 no host name found for IP address ::1 -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [::1] P=esmtp S=sss id=E10HmbB-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [::1] P=esmtp S=sss id=E10HmbA-0005vi-00@myhost.test.ex diff --git a/test/log/1023 b/test/log/1023 new file mode 100644 index 000000000..d946d9c74 --- /dev/null +++ b/test/log/1023 @@ -0,0 +1,9 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 Start queue run: pid=pppp -qf +1999-03-02 09:44:33 10HmaX-0005vi-00 => user6@h2.test.ex R=client T=send_to_server2 H=::1 [::1] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp -qf + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D (IPv6 and IPv4) +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2102 b/test/log/2102 index bddb8e973..91761cd68 100644 --- a/test/log/2102 +++ b/test/log/2102 @@ -41,7 +41,11 @@ 1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2Igy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSodF3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xwPCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYGOhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNSgCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59YtxxJC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPDhmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJhJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovdVVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY= 1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx 1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac +<<<<<<< HEAD +1999-03-02 09:44:33 ver: TLS1.x +======= 1999-03-02 09:44:33 ver: TLSv1.x +>>>>>>> 4.next 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss 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 Our cert SN: <CN=server1.example_ec.com> diff --git a/test/log/4600 b/test/log/4600 index 195cb4b7b..1e8af6531 100644 --- a/test/log/4600 +++ b/test/log/4600 @@ -18,7 +18,7 @@ 1999-03-02 09:44:33 Authentication-Results: myhost.test.ex;\n spf=pass smtp.mailfrom=example.com 1999-03-02 09:44:33 spf_result neutral (guess <yes>) 1999-03-02 09:44:33 spf_header_comment myhost.test.ex: ip4.ip4.ip4.ip4 is neither permitted nor denied by domain of test.example.com -1999-03-02 09:44:33 spf_smtp_comment Please see http://www.openspf.org/Why?id=b%40test.example.com&ip=ip4.ip4.ip4.ip4&receiver=myhost.test.ex : Reason: mechanism +1999-03-02 09:44:33 spf_smtp_comment Please see http://www.open-spf.org/Why?id=b%40test.example.com&ip=ip4.ip4.ip4.ip4&receiver=myhost.test.ex : Reason: mechanism 1999-03-02 09:44:33 spf_received Received-SPF: neutral (myhost.test.ex: ip4.ip4.ip4.ip4 is neither permitted nor denied by domain of test.example.com) client-ip=ip4.ip4.ip4.ip4; envelope-from=b@test.example.com; helo=testclient; 1999-03-02 09:44:33 Authentication-Results: myhost.test.ex;\n spf=neutral (best guess record for domain) smtp.mailfrom=test.example.com 1999-03-02 09:44:33 H=(testclient) [ip4.ip4.ip4.ip4] F=<b@test.example.com> rejected RCPT <fred@test.ex> diff --git a/test/log/5601 b/test/log/5601 index e9a22fc75..93969ab65 100644 --- a/test/log/5601 +++ b/test/log/5601 @@ -8,7 +8,7 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@test.ex R=client T=send_to_server3 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=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for CALLER@test.ex -1999-03-02 09:44:33 10HmbD-0005vi-00 Received TLS status callback, null content +1999-03-02 09:44:33 10HmbD-0005vi-00 Required TLS certificate status not received 1999-03-02 09:44:33 10HmbD-0005vi-00 == CALLER@test.ex R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): error: <<detail omitted>> 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for CALLER@test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 Server certificate revoked; reason: superseded diff --git a/test/log/5611 b/test/log/5611 index 200f32113..5b8405aaf 100644 --- a/test/log/5611 +++ b/test/log/5611 @@ -2,13 +2,13 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 => norequire@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaZ-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaZ-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@test.ex R=client T=send_to_server3 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=10HmbC-0005vi-00" -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER@test.ex R=client T=send_to_server3 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=10HmbC-0005vi-00" +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbD-0005vi-00 Received TLS status callback, null content +1999-03-02 09:44:33 10HmbD-0005vi-00 Required TLS certificate status not received 1999-03-02 09:44:33 10HmbD-0005vi-00 == CALLER@test.ex R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): error: <<detail omitted>> 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbE-0005vi-00 Server certificate revoked; reason: superseded @@ -24,12 +24,12 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 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 10HmbA-0005vi-00 client claims: ocsp status 0 (notreq) -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com -1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <nostaple@test.ex> R=server -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 client claims: ocsp status 0 (notreq) +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com +1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <nostaple@test.ex> R=server +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 client claims: ocsp status 4 (verified) -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@server1.example.com +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbA-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 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/5602 b/test/log/5612 index 95a283edd..95a283edd 100644 --- a/test/log/5602 +++ b/test/log/5612 diff --git a/test/log/5615 b/test/log/5615 new file mode 100644 index 000000000..314fd91d8 --- /dev/null +++ b/test/log/5615 @@ -0,0 +1,16 @@ +1999-03-02 09:44:33 1: TLS1.2 Server sends good leaf-staple on request, to client requiring RSA auth +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => rsa.auth@test.ex R=client T=remote_delivery 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=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 2: TLS1.3 Server sends good 3-element staple on request, to client requiring RSA auth +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaZ-0005vi-00 => rsa.auth@test.ex R=client T=remote_delivery 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-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed + +******** SERVER ******** +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 acl_mail: ocsp in status: 4 (verified) +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com +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 acl_mail: ocsp in status: 4 (verified) +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com diff --git a/test/log/5651 b/test/log/5651 index 2b2af41c9..bcd662f5b 100644 --- a/test/log/5651 +++ b/test/log/5651 @@ -2,11 +2,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 => norequire@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaZ-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaZ-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@test.ex R=client T=send_to_server3 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=10HmbC-0005vi-00" -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER@test.ex R=client T=send_to_server3 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=10HmbC-0005vi-00" +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbD-0005vi-00 == CALLER@test.ex R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (certificate status check failed) 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss @@ -21,12 +21,12 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire@test.ex> R=server 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 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 10HmbA-0005vi-00 client claims: OCSP status 0 (notreq) -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com -1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <nostaple@test.ex> R=server -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 client claims: OCSP status 0 (notreq) +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com +1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <nostaple@test.ex> R=server +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 client claims: OCSP status 4 (verified) -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbB-0005vi-00@server1.example.com +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbA-0005vi-00@server1.example.com 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 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/5652 b/test/log/5665 index cf31aa340..cf31aa340 100644 --- a/test/log/5652 +++ b/test/log/5665 diff --git a/test/log/5655 b/test/log/5670 index 4cb16c24c..9936c8592 100644 --- a/test/log/5655 +++ b/test/log/5670 @@ -15,13 +15,10 @@ ******** SERVER ******** 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 1999-03-02 09:44:33 acl_mail: ocsp in status: 4 (verified) 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com 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 1999-03-02 09:44:33 acl_mail: ocsp in status: 1 (notresp) 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=localhost (server1.example.com) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com 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 1999-03-02 09:44:33 TLS error on connection from localhost [127.0.0.1] (recv): The TLS connection was non-properly terminated. diff --git a/test/log/5740 b/test/log/5740 index 621aefb14..5b74bfbd1 100644 --- a/test/log/5740 +++ b/test/log/5740 @@ -15,7 +15,7 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 client ocsp status: 4 (verified) 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for failrequire@test.ex -1999-03-02 09:44:33 10HmbF-0005vi-00 Received TLS status callback, null content +1999-03-02 09:44:33 10HmbF-0005vi-00 Required TLS certificate status not received 1999-03-02 09:44:33 10HmbF-0005vi-00 client ocsp status: 1 (notresp) 1999-03-02 09:44:33 10HmbF-0005vi-00 == failrequire@test.ex R=client T=send_to_server3 defer (-37) H=127.0.0.1 [127.0.0.1]: TLS session: (SSL_connect): error: <<detail omitted>> 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for failrevoked@test.ex diff --git a/test/log/5821 b/test/log/5821 index 98282ecc2..c1da057cf 100644 --- a/test/log/5821 +++ b/test/log/5821 @@ -8,7 +8,7 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@localhost.test.ex R=client T=send_to_server H=localhost.test.ex [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@dane256ee.test.ex -1999-03-02 09:44:33 10HmbD-0005vi-00 => CALLER@dane256ee.test.ex R=client T=send_to_server H=dane256ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.2:RSA_CAMELLIA_256_GCM-SHAnnn:256 CV=dane DN="CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00" +1999-03-02 09:44:33 10HmbD-0005vi-00 => CALLER@dane256ee.test.ex R=client T=send_to_server H=dane256ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:RSA__CAMELLIA_256_GCM:256 CV=dane DN="CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00" 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed ******** SERVER ******** @@ -26,6 +26,6 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@localhost.test.ex> R=server 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 1999-03-02 09:44:33 "rcpt ACL" -1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.2:RSA_CAMELLIA_256_GCM-SHAnnn:256 CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for CALLER@dane256ee.test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:RSA__CAMELLIA_256_GCM:256 CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for CALLER@dane256ee.test.ex 1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <CALLER@dane256ee.test.ex> R=server 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed diff --git a/test/rejectlog/0618 b/test/rejectlog/0618 index 3b9bea1a0..555a47591 100644 --- a/test/rejectlog/0618 +++ b/test/rejectlog/0618 @@ -3,6 +3,4 @@ 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<a@dump.ex> rejected RCPT <rmt_reject@test.ex> 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<c@dump.ex> temporarily rejected RCPT <rmt_defer@test.ex> 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<d@dump.ex> temporarily rejected RCPT <rmt_defer@test.ex> -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<c@dump.ex> temporarily rejected RCPT <rmt_defer@test.ex> -1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<d@dump.ex> temporarily rejected RCPT <rmt_defer@test.ex> 1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] F=<e@dump.ex> rejected RCPT <rmt_reject@test.ex> diff --git a/test/runtest b/test/runtest index 30315044f..f53b9d72b 100755 --- a/test/runtest +++ b/test/runtest @@ -64,7 +64,7 @@ my $force_continue = 0; my $force_update = 0; my $log_failed_filename = 'failed-summary.log'; my $log_summary_filename = 'run-summary.log'; -my $more = 'less -XF'; +my @more = qw'less -XF'; my $optargs = ''; my $save_output = 0; my $server_opts = ''; @@ -800,6 +800,12 @@ RESET_AFTER_EXTRA_LINE_READ: # Also, the length of space at the end of the host line is dependent # on the length of the longest line, so strip it also on otherwise # un-rewritten lines like localhost + # + # host 127.0.0.1 [127.0.0.1] + # host 10.0.0.1 [10.0.0.1]- + # + # host 127.0.0.1 [127.0.0.1]-- + # host 169.16.16.16 [169.16.16.10] s/^\s+host\s(\S+)\s+(\S+)/ host $1 $2/; s/^\s+(host\s\S+\s\S+)\s+(port=.*)/ host $1 $2/; @@ -811,7 +817,7 @@ RESET_AFTER_EXTRA_LINE_READ: s/(^|\W)\K\Q$parm_ipv6_stripped\E/ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6/g; s/\b\Q$parm_ipv4r\E\b/ip4-reverse/g; s/(^|\W)\K\Q$parm_ipv6r\E/ip6-reverse/g; - s/^(\s+host\s\S+\s+\[\S+\]) +$/$1 /; + s/^\s+host\s\S+\s+\[\S+\]\K +$//; # strip, not collapse the trailing whitespace # ======== Test network IP addresses ======== @@ -1118,6 +1124,7 @@ RESET_AFTER_EXTRA_LINE_READ: next if /DNS lookup of \S+ \(AAAA\) using fakens/; next if / in dns_ipv4_lookup?/; next if / writing neg-cache entry for .*AAAA/; + next if /^faking res_search\(AAAA\) response length as 65535/; if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/) { @@ -1125,6 +1132,17 @@ RESET_AFTER_EXTRA_LINE_READ: next; } + # Non-TLS bulds have a different Recieved: header expansion + s/^((.*)\t}}}}by \$primary_hostname \$\{if def:received_protocol \{with \$received_protocol }})\(Exim \$version_number\)$/$1\${if def:tls_in_cipher_std { tls \$tls_in_cipher_std\n$2\t}}(Exim \$version_number)/; + s/^((\s*).*considering: with \$received_protocol }})\(Exim \$version_number\)$/$1\${if def:tls_in_cipher_std { tls \$tls_in_cipher_std\n$2\t}}(Exim \$version_number)/; + if (/condition: def:tls_in_cipher_std$/) + { + $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; + $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; + $_= <IN>; $_= <IN>; $_= <IN>; next; + } + + # Skip tls_advertise_hosts and hosts_require_tls checks when the options # are unset, because tls ain't always there. @@ -1364,7 +1382,7 @@ RESET_AFTER_EXTRA_LINE_READ: # openssl version variances s/(TLS error on connection [^:]*: error:)[0-9A-F]{8}(:system library):(?:fopen|func\(4095\)):(No such file or directory)$/$1xxxxxxxx$2:fopen:$3/; - s/(DANE attempt failed.*error:)[0-9A-F]{8}(:SSL routines:)(ssl3_get_server_certificate|tls_process_server_certificate|CONNECT_CR_CERT)(?=:certificate verify failed$)/$1xxxxxxxx$2ssl3_get_server_certificate/; + s/(DANE attempt failed.*error:)[0-9A-F]{8}(:SSL routines:)(?:(?i)ssl3_get_server_certificate|tls_process_server_certificate|CONNECT_CR_CERT)(?=:certificate verify failed$)/$1xxxxxxxx$2ssl3_get_server_certificate/; s/(DKIM: validation error: )error:[0-9A-F]{8}:rsa routines:(?:(?i)int_rsa_verify|CRYPTO_internal):(?:bad signature|algorithm mismatch)$/$1Public key signature verification has failed./; s/ARC: AMS signing: privkey PEM-block import: error:\K[0-9A-F]{8}:(PEM routines):get_name:(no start line)/0906D06C:$1:PEM_read_bio:$2/; @@ -1554,7 +1572,7 @@ if (! -e $sf_current) print "\n"; print "------------ $f -----------\n" if (defined $rf && -s $rf && defined $rsf && -s $rsf); - system("$more '$f'"); + system @more => $f; } } @@ -1636,26 +1654,25 @@ if (-e $sf_current) } } - open(MUNGED, '>', $mf) || tests_exit(-1, "Failed to open $mf: $!"); - for ($i = 0; $i < @munged; $i++) - { print MUNGED $munged[$i]; } - close(MUNGED); + open(my $fh, '>', $mf) or tests_exit(-1, "Failed to open $mf: $!"); + print $fh @munged; } # Deal with log sorting if ($sortfile) { - my(@munged, $i, $j); - open(MUNGED, $mf) || tests_exit(-1, "Failed to open $mf: $!"); - @munged = <MUNGED>; - close(MUNGED); + my @munged = do { + open(my $fh, '<', $mf) or tests_exit(-1, "Failed to open $mf: $!"); + <$fh>; + }; - for ($i = 0; $i < @munged; $i++) + for (my $i = 0; $i < @munged; $i++) { if ($munged[$i] =~ /^[-\d]{10}\s[:\d]{8}\s[-A-Za-z\d]{16}\s[-=*]>/) { + my $j; for ($j = $i + 1; $j < @munged; $j++) { last if $munged[$j] !~ @@ -1667,11 +1684,9 @@ if (-e $sf_current) } } - open(MUNGED, ">$mf") || tests_exit(-1, "Failed to open $mf: $!"); - print MUNGED "**NOTE: The delivery lines in this file have been sorted.\n"; - for ($i = 0; $i < @munged; $i++) - { print MUNGED $munged[$i]; } - close(MUNGED); + open(my $fh, '>', $mf) or tests_exit(-1, "Failed to open $mf: $!"); + print $fh "**NOTE: The delivery lines in this file have been sorted.\n"; + print $fh @munged; } # Do the comparison @@ -1681,7 +1696,7 @@ if (-e $sf_current) # Handle comparison failure print "** Comparison of $mf with $sf_current failed"; - system("$more test-cf"); + system @more => 'test-cf'; print "\n"; for (;;) @@ -1712,8 +1727,7 @@ else # if we deal with a flavour file, we can't delete it, because next time the generic # file would be used again if ($sf_current eq $sf_flavour) { - open(FOO, ">$sf_current"); - close(FOO); + open(my $fh, '>', $sf_current); } else { tests_exit(-1, "Failed to unlink $sf_current") if !unlink($sf_current); @@ -1779,7 +1793,7 @@ $munges = }, 'debug_pid' => - { 'stderr' => 's/(^\s{0,4}|(?<=Process )|(?<=child ))\d{1,5}/ppppp/g' }, + { 'stderr' => 's/(^\s{0,4}|(?<=Process )|(?<=child ))\d+/ppppp/g' }, 'optional_dsn_info' => { 'mail' => '/^(X-(Remote-MTA-(smtp-greeting|helo-response)|Exim-Diagnostic|(body|message)-linecount):|Remote-MTA: X-ip;)/' @@ -2175,34 +2189,37 @@ if (/^dbmbuild\s+(\S+)\s+(\S+)/) if (/^dump\s+(\S+)/) { - my($which) = $1; - my(@temp); + my $which = $1; print ">> ./eximdir/exim_dumpdb $parm_cwd/spool $which\n" if $debug; - open(IN, "./eximdir/exim_dumpdb $parm_cwd/spool $which |"); - open(OUT, ">>test-stdout"); - print OUT "+++++++++++++++++++++++++++\n"; + open(my $in, "-|", './eximdir/exim_dumpdb', "$parm_cwd/spool", $which) or die "Can't run exim_dumpdb: $!"; + open(my $out, ">>test-stdout"); + print $out "+++++++++++++++++++++++++++\n"; if ($which eq "retry") { - $/ = "\n "; - @temp = <IN>; - $/ = "\n"; - - @temp = sort { - my($aa) = split(' ', $a); - my($bb) = split(' ', $b); - return $aa cmp $bb; - } @temp; - + # the sort key is the first part of the retry db dump line, but for + # sorting we (temporarly) replace the own hosts ipv4 with a munged + # version, which matches the munging that is done later + # Why? We must ensure sure, that 127.0.0.1 always sorts first + # map-sort-map: Schwartz's transformation + # test 0099 + my @temp = map { $_->[1] } + sort { $a->[0] cmp $b->[0] } + #map { [ (split)[0] =~ s/\Q$parm_ipv4/ip4.ip4.ip4.ip4/gr, $_ ] } # this is too modern for 5.10.1 + map { + (my $k = (split)[0]) =~ s/\Q$parm_ipv4/ip4.ip4.ip4.ip4/g; + [ $k, $_ ] + } + do { local $/ = "\n "; <$in> }; foreach $item (@temp) { $item =~ s/^\s*(.*)\n(.*)\n?\s*$/$1\n$2/m; - print OUT " $item\n"; + print $out " $item\n"; } } else { - @temp = <IN>; + my @temp = <$in>; if ($which eq "callout") { @temp = sort { @@ -2211,11 +2228,9 @@ if (/^dump\s+(\S+)/) return $aa cmp $bb; } @temp; } - print OUT @temp; + print $out @temp; } - - close(IN); - close(OUT); + close($in); # close it explicitly, otherwise $? does not get set return 1; } @@ -2558,9 +2573,24 @@ elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+ if ($args =~ /\$msg/) { - my @listcmd = ("$parm_cwd/eximdir/exim", '-bp', + my($queuespec); + if ($args =~ /-qG\w+/) { $queuespec = $&; } + + my @listcmd; + + if (defined $queuespec) + { + @listcmd = ("$parm_cwd/eximdir/exim", '-bp', + $queuespec, + "-DEXIM_PATH=$parm_cwd/eximdir/exim", + -C => "$parm_cwd/test-config"); + } + else + { + @listcmd = ("$parm_cwd/eximdir/exim", '-bp', "-DEXIM_PATH=$parm_cwd/eximdir/exim", -C => "$parm_cwd/test-config"); + } print ">> Getting queue list from:\n>> @listcmd\n" if $debug; # We need the message ids sorted in ascending order. # Message id is: <timestamp>-<pid>-<fractional-time>. On some systems (*BSD) the @@ -2785,7 +2815,7 @@ umask 022; # Check for the "less" command # ################################################## -$more = 'more' if system('which less >/dev/null 2>&1') != 0; +@more = 'more' if system('which less >/dev/null 2>&1') != 0; @@ -2810,7 +2840,7 @@ Getopt::Long::Configure qw(no_getopt_compat); GetOptions( 'debug' => sub { $debug = 1; $cr = "\n" }, 'diff' => sub { $cf = 'diff -u' }, - 'continue' => sub { $force_continue = 1; $more = 'cat' }, + 'continue' => sub { $force_continue = 1; @more = 'cat' }, 'update' => \$force_update, 'ipv4!' => \$have_ipv4, 'ipv6!' => \$have_ipv6, @@ -3437,14 +3467,15 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = <IFCONFIG>)) if (not $parm_ipv4 and /^\s*inet(?:\saddr(?:ess))?:?\s*(\d+\.\d+\.\d+\.\d+)(?:\/\d+)?\s/i) { - # It would ne nice to be able to vary the /16 used for manyhome; we could take + # It would be nice to be able to vary the /16 used for manyhome; we could take # an option to runtest used here - but we'd also have to pass it on to fakens. # Possibly an environment variable? next if $1 eq '0.0.0.0' or $1 =~ /^(?:127|10\.250)\./; $parm_ipv4 = $1; } - if (not $parm_ipv6 and /^\s*inet6(?:\saddr(?:ess))?:?\s*([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i) + if ( (not $parm_ipv6 or $parm_ipv6 =~ /%/) + and /^\s*inet6(?:\saddr(?:ess))?:?\s*([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i) { next if $1 eq '::' or $1 eq '::1' or $1 =~ /^ff00/i or $1 =~ /^fe80::1/i; $parm_ipv6 = $1; @@ -3813,6 +3844,10 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++) } unlink("$parm_cwd/test-config"); } + elsif (/^ipv6-non-linklocal/) + { + if ($parm_ipv6 =~ /%/) { $wantthis = 0; last; } + } else { tests_exit(-1, "Unknown line in \"scripts/$testdir/REQUIRES\": \"$_\""); @@ -3953,7 +3988,7 @@ if ($have_ipv4 && $parm_ipv4 ne "127.0.0.1") tests_exit(-1, "Failed to open $parm_cwd/dnszones/db.ip4.$components[0]: $!"); print OUT "$components[3].$components[2].$components[1] PTR $parm_hostname.\n\n"; close(OUT); - } + } else { open(OUT, ">$parm_cwd/dnszones/db.ip4.$components[0]") || @@ -4305,11 +4340,11 @@ foreach $test (@test_list) last if /^[rc]$/i; if (/^e$/i) { - system("$more test-stderr"); + system @more => 'test-stderr'; } elsif (/^o$/i) { - system("$more test-stdout"); + system @more => 'test-stdout'; } } diff --git a/test/scripts/0000-Basic/0206 b/test/scripts/0000-Basic/0206 index 64afd8014..2739f29e1 100644 --- a/test/scripts/0000-Basic/0206 +++ b/test/scripts/0000-Basic/0206 @@ -6,11 +6,11 @@ sudo exim -Mf $msg1 **** # now 2 frozen, one of which is a bounce # check that ignore_bounce_errors_after finishes off the frozen bounce (only) -millisleep 2500 -exim -qf +#sleep 5 +exim -Tqt 5s/5s/ -qf **** -sleep 3 +#sleep 6 # check that timeout_frozen_after finishes off the (remaining) frozen -exim -q +exim -Tqt 11s/11s -q **** no_msglog_check diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576 index dedc73d23..ddf17f8d9 100644 --- a/test/scripts/0000-Basic/0576 +++ b/test/scripts/0000-Basic/0576 @@ -72,4 +72,51 @@ sudo mv DIR/spool/alternate/input/* DIR/spool/input/ exim -q **** # +# +# Native queue transfer +### load messages +exim -bs +MAIL FROM:<CALLER@myhost.test.ex> +RCPT TO: <normal@test.ex> +DATA +Subject: test + +foo +. +RSET +MAIL FROM:<CALLER@myhost.test.ex> +RCPT TO: <alternate@test.ex> +DATA +Subject: test + +foo +. +QUIT +**** +### default q +exim -bp +**** +### alternate q +exim -bp -qGalternate +**** +# +exim -MG third $msg1 +**** +exim -qGalternate -MG third $msg1 +**** +### third q +exim -bp -qGthird +**** +exim -qGthird -MG '' $msg1 $msg2 +**** +### default q +exim -bp +**** +### alternate q +exim -bp -qGalternate +**** +### third q +exim -bp -qGthird +**** +# no_stderr_check diff --git a/test/scripts/0000-Basic/0618 b/test/scripts/0000-Basic/0618 index 13d395f02..69a53c691 100644 --- a/test/scripts/0000-Basic/0618 +++ b/test/scripts/0000-Basic/0618 @@ -76,8 +76,9 @@ exim -q # # Client requests notification of deferral. First time of trying, we get # a defer but queue-time probably has not hit the 1st retry time yet, so no DSN -# will be sent and the message remains queued. Later, after a sleep, we will -# try again. +# will be sent and the message remains queued. Then, claiming time has elapsed, +# we will look again (expecting a delay-DSN to be produced). We won't see a +# retry since the actual retry time has not passed. exim -z defer/delay **** client HOSTIPV4 PORT_D @@ -126,7 +127,6 @@ QUIT **** exim -q **** -sleep 3 # # # @@ -134,7 +134,7 @@ sleep 3 # We should see the notify for c@dump.ex but not d@dump.ex exim -z playout **** -exim -q +exim -Tqt 10s/ -q **** sleep 1 exim -Mrm $msg1 $msg2 diff --git a/test/scripts/0000-Basic/0904 b/test/scripts/0000-Basic/0904 index 2157e61a8..fa72256c0 100644 --- a/test/scripts/0000-Basic/0904 +++ b/test/scripts/0000-Basic/0904 @@ -146,6 +146,31 @@ QUIT **** # # +# Server rejects RCPT. Client should not proceed to BDAT. +server PORT_S +220 Greetings +EHLO +250-Hello there +250 CHUNKING +MAIL FROM +250 OK +RCPT TO +550 sorry, no +QUIT +**** +sudo exim -odf -bS +EHLO test +MAIL FROM:<sender@source.dom> +RCPT TO:<ebad@test.ex> +DATA +Subject: foo + +data +. +QUIT +**** +# +# ################################################### # # Pipelined cases diff --git a/test/scripts/1000-Basic-ipv6/1003 b/test/scripts/1000-Basic-ipv6/1003 index 1be6923b0..e52a1f57b 100644 --- a/test/scripts/1000-Basic-ipv6/1003 +++ b/test/scripts/1000-Basic-ipv6/1003 @@ -9,11 +9,6 @@ exim user4@h1.test.ex 1 interface: <; ::1 ; HOSTIPV4 **** -exim user6@h2.test.ex - -2 -interface: <; HOSTIPV6 ; HOSTIPV4 -**** exim user6@h3.test.ex 3 diff --git a/test/scripts/1020-Linklocal-ipv6/1023 b/test/scripts/1020-Linklocal-ipv6/1023 new file mode 100644 index 000000000..2e5be6633 --- /dev/null +++ b/test/scripts/1020-Linklocal-ipv6/1023 @@ -0,0 +1,20 @@ +# interface selection (v4 vs v6) in outgoing SMTP, non-linklocal +need_ipv4 +need_ipv6 +# +exim -DSERVER=server -bd -oX PORT_D +**** +# +# This tries to send to ::1 from HOSTIPV6 - which is ok until HOSTIPV6 +# is a link-local addr (with a scope-id specifying the link). Then, +# it seems, ::1 is not on that link (for Linux & FreeBSD, at least). The connect +# times out and the testcase fails. +exim user6@h2.test.ex + +2 +interface: <; HOSTIPV6 ; HOSTIPV4 +**** +exim -qf +**** +killdaemon +no_msglog_check diff --git a/test/scripts/1020-Linklocal-ipv6/REQUIRES b/test/scripts/1020-Linklocal-ipv6/REQUIRES new file mode 100644 index 000000000..f8edd3e54 --- /dev/null +++ b/test/scripts/1020-Linklocal-ipv6/REQUIRES @@ -0,0 +1,2 @@ +support IPv6 +ipv6-non-linklocal diff --git a/test/scripts/4540-DKIM-Ed25519/4540 b/test/scripts/4540-DKIM-Ed25519/4540 index 504676e7c..22558dfa7 100644 --- a/test/scripts/4540-DKIM-Ed25519/4540 +++ b/test/scripts/4540-DKIM-Ed25519/4540 @@ -79,8 +79,7 @@ QUIT # # This should pass, an independently-generated sample from Scott Kitterman. -# I don't want to retain this longterm as it hits an external DNS record, -# not under the testsuite. +# We use a copied version of his DNS record. client 127.0.0.1 PORT_D ??? 220 HELO xxx diff --git a/test/scripts/5600-OCSP-OpenSSL/5602 b/test/scripts/5612-OCSP-OpenSSL-multileaf/5612 index 02c27ce44..02c27ce44 100644 --- a/test/scripts/5600-OCSP-OpenSSL/5602 +++ b/test/scripts/5612-OCSP-OpenSSL-multileaf/5612 diff --git a/test/scripts/5612-OCSP-OpenSSL-multileaf/REQUIRES b/test/scripts/5612-OCSP-OpenSSL-multileaf/REQUIRES new file mode 100644 index 000000000..0d1bd9f7a --- /dev/null +++ b/test/scripts/5612-OCSP-OpenSSL-multileaf/REQUIRES @@ -0,0 +1,4 @@ +support OpenSSL +support OCSP +running IPv4 +feature _HAVE_TLS_OCSP_LIST diff --git a/test/scripts/5615-OCSP-OpenSSL-1.3/5615 b/test/scripts/5615-OCSP-OpenSSL-1.3/5615 new file mode 100644 index 000000000..17d5f7a0e --- /dev/null +++ b/test/scripts/5615-OCSP-OpenSSL-1.3/5615 @@ -0,0 +1,54 @@ +# OCSP stapling, server, multiple chain-element OCSP +# +# +# +# +exim -z '1: TLS1.2 Server sends good leaf-staple on request, to client requiring RSA auth' +**** +# +exim -bd -oX PORT_D -DSERVER=server -DLIMIT=TLS1.2 +**** +# +exim -odf -DOPT=rsa -DLIMIT=TLS1.2 rsa.auth@test.ex +Subject: test + +. +**** +killdaemon +# +# +exim -z '2: TLS1.3 Server sends good 3-element staple on request, to client requiring RSA auth' +**** +# +# Works when the (single) proof file has an ocsp-response with 3 statusses. +# Contrast with with GnuTLS which can do either that or have 3 proof files +# each with one status. +# +exim -bd -oX PORT_D -DSERVER=server -DLIMIT=TLS1.3 +**** +exim -odf -DOPT=rsa rsa.auth@test.ex +Subject: test + +. +**** +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 -odf -DOPT=rsa rsa.auth@test.ex +#Subject: test +# +#. +#**** +#killdaemon +## +## +# +# +sudo rm -fr tmp/ +no_msglog_check diff --git a/test/scripts/5615-OCSP-OpenSSL-1.3/REQUIRES b/test/scripts/5615-OCSP-OpenSSL-1.3/REQUIRES new file mode 100644 index 000000000..7df03fbe8 --- /dev/null +++ b/test/scripts/5615-OCSP-OpenSSL-1.3/REQUIRES @@ -0,0 +1,4 @@ +support OpenSSL +support OCSP +running IPv4 +feature _HAVE_TLS1_3 diff --git a/test/scripts/5650-OCSP-GnuTLS/5652 b/test/scripts/5665-OCSP-GnuTLS-multileaf/5665 index 07fda294c..07fda294c 100644 --- a/test/scripts/5650-OCSP-GnuTLS/5652 +++ b/test/scripts/5665-OCSP-GnuTLS-multileaf/5665 diff --git a/test/scripts/5665-OCSP-GnuTLS-multileaf/REQUIRES b/test/scripts/5665-OCSP-GnuTLS-multileaf/REQUIRES new file mode 100644 index 000000000..37e377db0 --- /dev/null +++ b/test/scripts/5665-OCSP-GnuTLS-multileaf/REQUIRES @@ -0,0 +1,4 @@ +support GnuTLS +support OCSP +running IPv4 +feature _HAVE_TLS_OCSP_LIST diff --git a/test/scripts/5655-OCSP-GnuTLS-1.3/5655 b/test/scripts/5670-OCSP-GnuTLS-1.3/5670 index 25ebdfd6b..1df75fbf9 100644 --- a/test/scripts/5655-OCSP-GnuTLS-1.3/5655 +++ b/test/scripts/5670-OCSP-GnuTLS-1.3/5670 @@ -7,7 +7,6 @@ sudo chown -R EXIMUSER:EXIMGROUP tmp sudo chmod -R a+rwx DIR/tmp/ocsp perl chdir 'aux-fixed/exim-ca/example.com'; -system 'cat server1.example.com/server1.example.com.ocsp.signernocert.good.resp.pem CA/Signer.ocsp.signernocert.good.resp.pem CA/CA.ocsp.signernocert.good.resp.pem > DIR/tmp/ocsp/triple.ocsp.pem'; system 'cat server1.example.com/server1.example.com.ocsp.signernocert.good.resp.pem CA/Signer.ocsp.signernocert.revoked.resp.pem > DIR/tmp/ocsp/double_r.ocsp.pem'; **** # @@ -15,7 +14,7 @@ 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' **** # -exim -bd -oX PORT_D -DSERVER=server -DLIMIT=TLS1.2 +sudo exim -bd -oX PORT_D -DSERVER=server -DLIMIT=TLS1.2 **** # exim -odf -DOPT=rsa -DLIMIT=TLS1.2 rsa.auth@test.ex @@ -29,6 +28,7 @@ killdaemon exim -z '2: TLS1.3 Server sends good 3-element staple on request, to client requiring RSA auth' **** # +# Prefix with sudo to get SSLKEYLOGFILE to work. Only works on the server. exim -bd -oX PORT_D -DSERVER=server -DLIMIT=TLS1.3 **** exim -odf -DOPT=rsa rsa.auth@test.ex diff --git a/test/scripts/5655-OCSP-GnuTLS-1.3/REQUIRES b/test/scripts/5670-OCSP-GnuTLS-1.3/REQUIRES index ab5a9721d..ab5a9721d 100644 --- a/test/scripts/5655-OCSP-GnuTLS-1.3/REQUIRES +++ b/test/scripts/5670-OCSP-GnuTLS-1.3/REQUIRES diff --git a/test/src/fakens.c b/test/src/fakens.c index 6d8a99df5..2c82c5a82 100644 --- a/test/src/fakens.c +++ b/test/src/fakens.c @@ -313,8 +313,8 @@ Arguments: qtypelen the length of qtype pkptr points to the output buffer pointer; this is updated countptr points to the record count; this is updated - dnssec points to the AD flag indicator; this is updated - aa points to the AA flag indicator; this is updated + dnssec_p points to the AD flag indicator; this is updated + aa_p points to the AA flag indicator; this is updated Returns: 0 on success, else HOST_NOT_FOUND or NO_DATA or NO_RECOVERY or PASS_ON - the latter if a "PASS ON NOT FOUND" line is seen @@ -322,7 +322,7 @@ Returns: 0 on success, else HOST_NOT_FOUND or NO_DATA or NO_RECOVERY or static int find_records(FILE *f, uschar *zone, uschar *domain, uschar *qtype, - int qtypelen, uschar **pkptr, int *countptr, BOOL * dnssec, BOOL * aa) + int qtypelen, uschar **pkptr, int *countptr, BOOL * dnssec_p, BOOL * aa_p) { int yield = HOST_NOT_FOUND; int domainlen = Ustrlen(domain); @@ -448,8 +448,8 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL) if (yield == HOST_NOT_FOUND) { yield = NO_DATA; - if (dnssec) *dnssec = TRUE; /* cancelled by first nonsecure rec found */ - if (aa) *aa = TRUE; /* cancelled by first non-aa rec found */ + if (dnssec_p) *dnssec_p = TRUE; /* cancelled by first nonsecure rec found */ + if (aa_p) *aa_p = TRUE; /* cancelled by first non-aa rec found */ } /* Compare RR types; a CNAME record is always returned */ @@ -468,11 +468,11 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL) if (delay) millisleep(delay); - if (dnssec && !rr_sec) - *dnssec = FALSE; /* cancel AD return */ + if (dnssec_p && !rr_sec) + *dnssec_p = FALSE; /* cancel AD return */ - if (aa && !rr_aa) - *aa = FALSE; /* cancel AA return */ + if (aa_p && !rr_aa) + *aa_p = FALSE; /* cancel AA return */ if (rr_ignore) continue; @@ -668,8 +668,8 @@ uschar qtype[12]; uschar packet[2048 * 32 + 32]; HEADER *header = (HEADER *)packet; uschar *pk = packet; -BOOL dnssec; -BOOL aa; +BOOL dnssec = FALSE; +BOOL aa = FALSE; signal(SIGALRM, alarmfn); @@ -683,15 +683,14 @@ if (argc != 4) (void)sprintf(CS buffer, "%s/dnszones", argv[1]); -d = opendir(CCS buffer); -if (d == NULL) +if (!(d = opendir(CCS buffer))) { fprintf(stderr, "fakens: failed to opendir %s: %s\n", buffer, strerror(errno)); return NO_RECOVERY; } -while ((de = readdir(d)) != NULL) +while ((de = readdir(d))) { uschar *name = US de->d_name; if (Ustrncmp(name, "qualify.", 8) == 0) @@ -778,7 +777,7 @@ if (!(f = fopen(CS buffer, "r"))) header->qr = 1; /* query */ header->opcode = QUERY; /* standard query */ -header->tc = 0; /* no trucation */ +header->tc = 0; /* no truncation */ /* Find the records we want, and add them to the result. */ diff --git a/test/src/server.c b/test/src/server.c index 4cf126068..c1f1ecf21 100644 --- a/test/src/server.c +++ b/test/src/server.c @@ -159,7 +159,8 @@ putchar('\n'); #define udn 2 /* Unix domain socket number */ #define skn 2 /* Potential number of sockets */ -int main(int argc, char **argv) +int +main(int argc, char **argv) { int i; int port = 0; diff --git a/test/stderr/0044 b/test/stderr/0044 index d2891b87a..0de971e4a 100644 --- a/test/stderr/0044 +++ b/test/stderr/0044 @@ -240,7 +240,9 @@ new DNS lookup for 99.99.99.V4NET.rbl.test.ex DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) using fakens DNS lookup of 99.99.99.V4NET.rbl.test.ex (A) gave HOST_NOT_FOUND returning DNS_NOMATCH +faking res_search(A) response length as 65535 writing neg-cache entry for 99.99.99.V4NET.rbl.test.ex-A-xxxx, ttl 3000 +faking res_search(A) response length as 65535 dnslists: wrote cache entry, ttl=3000 DNS lookup for 99.99.99.V4NET.rbl.test.ex failed => that means V4NET.99.99.99 is not listed at rbl.test.ex diff --git a/test/stderr/0078 b/test/stderr/0078 index fc573ce9b..42092c03d 100644 --- a/test/stderr/0078 +++ b/test/stderr/0078 @@ -18,7 +18,7 @@ domain = mxt6.test.ex routed by lookuphost router envelope to: xx@mxt6.test.ex transport: remote_smtp - host ten-1.test.ex [V4NET.0.0.1] MX=5 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config diff --git a/test/stderr/0092 b/test/stderr/0092 index 715ca795c..7db741e6d 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -35,6 +35,7 @@ LOG: SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<u Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed diff --git a/test/stderr/0117 b/test/stderr/0117 index b4e5e8b2d..ad17fd9c1 100644 --- a/test/stderr/0117 +++ b/test/stderr/0117 @@ -15,9 +15,9 @@ domain = mxt9.test.ex routed by lookuphost router envelope to: xxx@mxt9.test.ex transport: <none> - host ten-1.test.ex [V4NET.0.0.1] MX=5 - host ten-2.test.ex [V4NET.0.0.2] MX=6 - host ten-3.test.ex [V4NET.0.0.3] MX=7 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no + host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no + host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -36,9 +36,9 @@ domain = mxt9a.test.ex routed by lookuphost router envelope to: xxx@mxt9a.test.ex transport: <none> - host ten-1.test.ex [V4NET.0.0.1] MX=5 - host ten-2.test.ex [V4NET.0.0.2] MX=6 - host ten-3.test.ex [V4NET.0.0.3] MX=7 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no + host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no + host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -57,7 +57,7 @@ domain = mxt9b.test.ex routed by lookuphost router envelope to: xxx@mxt9b.test.ex transport: <none> - host ten-1.test.ex [V4NET.0.0.1] MX=5 - host ten-2.test.ex [V4NET.0.0.2] MX=6 - host ten-3.test.ex [V4NET.0.0.3] MX=7 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no + host ten-2.test.ex [V4NET.0.0.2] MX=6 dnssec=no + host ten-3.test.ex [V4NET.0.0.3] MX=7 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0145 b/test/stderr/0145 index cd1151a2b..79a6f4ab1 100644 --- a/test/stderr/0145 +++ b/test/stderr/0145 @@ -12,6 +12,7 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@mxt10.test.ex >>> calling domainlist router +>>> mxt10.test.ex in "*"? yes (matched "*") >>> domainlist router declined for x@mxt10.test.ex >>> "more" is false: skipping remaining routers >>> no more routers @@ -34,6 +35,7 @@ LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify fail >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@ten-1.test.ex >>> calling domainlist router +>>> ten-1.test.ex in "*"? yes (matched "*") >>> routed by domainlist router >>> ----------- end verify ------------ >>> require: condition test succeeded in ACL "check_recipient" @@ -42,6 +44,7 @@ LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify fail >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@mxt10.test.ex >>> calling domainlist router +>>> mxt10.test.ex in "*"? yes (matched "*") >>> domainlist router declined for x@mxt10.test.ex >>> "more" is false: skipping remaining routers >>> no more routers diff --git a/test/stderr/0161 b/test/stderr/0161 index 88f106933..d4a6676eb 100644 --- a/test/stderr/0161 +++ b/test/stderr/0161 @@ -23,7 +23,7 @@ domain = mxt6.test.ex routed by lookuphost router envelope to: xx@mxt6.test.ex transport: remote_smtp - host ten-1.test.ex [V4NET.0.0.1] MX=5 + host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config diff --git a/test/stderr/0175 b/test/stderr/0175 index b2f1c655c..684b2b428 100644 --- a/test/stderr/0175 +++ b/test/stderr/0175 @@ -81,6 +81,7 @@ LOG: H=[V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: Sender >>> fail_sender2 router declined for user@ten-1.test.ex >>> ten-1.test.ex in "! +local_domains"? yes (end of list) >>> calling lookuphost router +>>> ten-1.test.ex in "*"? yes (matched "*") >>> routed by lookuphost router >>> ----------- end verify ------------ >>> require: condition test succeeded in ACL "check_recipient" diff --git a/test/stderr/0183 b/test/stderr/0183 index 44f567bc6..98d82f8e8 100644 --- a/test/stderr/0183 +++ b/test/stderr/0183 @@ -30,6 +30,7 @@ userx in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for userx@test.again.dns domain = test.again.dns +test.again.dns in "*"? yes (matched "*") DNS lookup of test.again.dns (MX) using fakens DNS lookup of test.again.dns (MX) gave TRY_AGAIN test.again.dns in dns_again_means_nonexist? no (option unset) @@ -60,6 +61,7 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@test.again.dns domain = test.again.dns +test.again.dns in "*"? yes (matched "*") DNS lookup of test.again.dns-MX: using cached value DNS_AGAIN lookuphost router: defer for abcd@test.again.dns message: host lookup did not complete @@ -86,10 +88,13 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex (MX) using fakens DNS lookup of ten-1.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000 +ten-1.test.ex (MX resp) DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex @@ -128,6 +133,7 @@ expanded list of hosts = 'test.again.dns' options = 'bydns' set transport smtp finding IP address for test.again.dns doing DNS lookup +test.again.dns in "*"? yes (matched "*") DNS lookup of test.again.dns (A) using fakens DNS lookup of test.again.dns (A) gave TRY_AGAIN test.again.dns in dns_again_means_nonexist? no (option unset) @@ -159,6 +165,7 @@ original list of hosts = '$domain' options = 'bydns' expanded list of hosts = 'test.again.dns' options = 'bydns' finding IP address for test.again.dns doing DNS lookup +test.again.dns in "*"? yes (matched "*") DNS lookup of test.again.dns-A: using cached value DNS_AGAIN useryz router: defer for userz@test.again.dns message: host lookup for test.again.dns did not complete (DNS timeout?) @@ -185,6 +192,7 @@ xyz in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for xyz@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded @@ -232,6 +240,7 @@ userx in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for userx@test.fail.dns domain = test.fail.dns +test.fail.dns in "*"? yes (matched "*") DNS lookup of test.fail.dns (MX) using fakens DNS lookup of test.fail.dns (MX) gave NO_RECOVERY returning DNS_FAIL @@ -261,6 +270,7 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@test.fail.dns domain = test.fail.dns +test.fail.dns in "*"? yes (matched "*") DNS lookup of test.fail.dns-MX: using cached value DNS_FAIL lookuphost router: defer for abcd@test.fail.dns message: host lookup did not complete @@ -287,10 +297,13 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex (MX) using fakens DNS lookup of ten-1.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000 +ten-1.test.ex (MX resp) DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex @@ -329,6 +342,7 @@ expanded list of hosts = 'test.fail.dns' options = 'bydns' set transport smtp finding IP address for test.fail.dns doing DNS lookup +test.fail.dns in "*"? yes (matched "*") DNS lookup of test.fail.dns (A) using fakens DNS lookup of test.fail.dns (A) gave NO_RECOVERY returning DNS_FAIL @@ -359,6 +373,7 @@ original list of hosts = '$domain' options = 'bydns' expanded list of hosts = 'test.fail.dns' options = 'bydns' finding IP address for test.fail.dns doing DNS lookup +test.fail.dns in "*"? yes (matched "*") DNS lookup of test.fail.dns-A: using cached value DNS_FAIL useryz router: defer for userz@test.fail.dns message: host lookup for test.fail.dns did not complete (DNS timeout?) @@ -385,6 +400,7 @@ xyz in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for xyz@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded @@ -432,9 +448,11 @@ userx in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for userx@nonexist.test.ex domain = nonexist.test.ex +nonexist.test.ex in "*"? yes (matched "*") DNS lookup of nonexist.test.ex (MX) using fakens DNS lookup of nonexist.test.ex (MX) gave HOST_NOT_FOUND returning DNS_NOMATCH +faking res_search(MX) response length as 65535 writing neg-cache entry for nonexist.test.ex-MX-xxxx, ttl 3000 lookuphost router declined for userx@nonexist.test.ex "more" is false: skipping remaining routers @@ -462,6 +480,7 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@nonexist.test.ex domain = nonexist.test.ex +nonexist.test.ex in "*"? yes (matched "*") DNS lookup of nonexist.test.ex-MX: using cached value DNS_NOMATCH lookuphost router declined for abcd@nonexist.test.ex "more" is false: skipping remaining routers @@ -489,10 +508,13 @@ abcd in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for abcd@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex (MX) using fakens DNS lookup of ten-1.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000 +ten-1.test.ex (MX resp) DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex @@ -531,9 +553,11 @@ expanded list of hosts = 'nonexist.test.ex' options = 'bydns' set transport smtp finding IP address for nonexist.test.ex doing DNS lookup +nonexist.test.ex in "*"? yes (matched "*") DNS lookup of nonexist.test.ex (A) using fakens DNS lookup of nonexist.test.ex (A) gave HOST_NOT_FOUND returning DNS_NOMATCH +faking res_search(A) response length as 65535 writing neg-cache entry for nonexist.test.ex-A-xxxx, ttl 3000 useryz router: defer for usery@nonexist.test.ex message: lookup of host "nonexist.test.ex" failed in useryz router @@ -561,6 +585,7 @@ original list of hosts = '$domain' options = 'bydns' expanded list of hosts = 'nonexist.test.ex' options = 'bydns' finding IP address for nonexist.test.ex doing DNS lookup +nonexist.test.ex in "*"? yes (matched "*") DNS lookup of nonexist.test.ex-A: using cached value DNS_NOMATCH useryz router: defer for userz@nonexist.test.ex message: lookup of host "nonexist.test.ex" failed in useryz router @@ -587,6 +612,7 @@ xyz in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for xyz@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded @@ -624,6 +650,7 @@ srv in "^srv"? yes (matched "^srv") calling srv router srv router called for srv@test.again.dns domain = test.again.dns +test.again.dns in "*"? yes (matched "*") DNS lookup of _smtp._tcp.test.again.dns (SRV) using fakens DNS lookup of _smtp._tcp.test.again.dns (SRV) gave TRY_AGAIN _smtp._tcp.test.again.dns in dns_again_means_nonexist? no (option unset) @@ -645,6 +672,7 @@ srv in "^srv"? yes (matched "^srv") calling srv router srv router called for srv@test.fail.dns domain = test.fail.dns +test.fail.dns in "*"? yes (matched "*") DNS lookup of _smtp._tcp.test.fail.dns (SRV) using fakens DNS lookup of _smtp._tcp.test.fail.dns (SRV) gave NO_RECOVERY returning DNS_FAIL @@ -697,9 +725,11 @@ userx in "!userd"? yes (end of list) calling lookuphost router lookuphost router called for userx@nonexist.example.com domain = nonexist.example.com +nonexist.example.com in "*"? yes (matched "*") DNS lookup of nonexist.example.com (MX) using fakens DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND returning DNS_NOMATCH +faking res_search(MX) response length as 65535 writing neg-cache entry for nonexist.example.com-MX-xxxx, ttl 2 lookuphost router declined for userx@nonexist.example.com "more" is false: skipping remaining routers @@ -738,10 +768,12 @@ checking "condition" "${acl {delay}}"... calling delay router delay router called for userd@nonexist.example.com domain = nonexist.example.com +nonexist.example.com in "*"? yes (matched "*") DNS lookup of nonexist.example.com-MX: cached value DNS_NOMATCH past valid time DNS lookup of nonexist.example.com (MX) using fakens DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND returning DNS_NOMATCH +faking res_search(MX) response length as 65535 update neg-cache entry for nonexist.example.com-MX-xxxx, ttl 2 delay router declined for userd@nonexist.example.com "more" is false: skipping remaining routers diff --git a/test/stderr/0278 b/test/stderr/0278 index f8219ff8e..834155bf9 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -288,13 +288,17 @@ unknown in "+never_localparts : +n2_localparts : !+local_localparts"? yes (end o calling r2 router r2 router called for unknown@test.ex domain = test.ex +test.ex in "*"? yes (matched "*") DNS lookup of test.ex (MX) using fakens DNS lookup of test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for test.ex-MX-xxxx, ttl 3000 +test.ex (MX resp) DNSSEC DNS lookup of test.ex (A) using fakens DNS lookup of test.ex (A) gave NO_DATA returning DNS_NODATA +faking res_search(A) response length as 65535 writing neg-cache entry for test.ex-A-xxxx, ttl 3000 r2 router declined for unknown@test.ex --------> r3 router <-------- diff --git a/test/stderr/0342 b/test/stderr/0342 index 151a237aa..3f9891c57 100644 --- a/test/stderr/0342 +++ b/test/stderr/0342 @@ -13,10 +13,12 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@ten-1 >>> calling dnslookup router +>>> ten-1 in "*"? yes (matched "*") >>> re-routed to x@ten-1.test.ex >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@ten-1.test.ex >>> calling dnslookup router +>>> ten-1.test.ex in "*"? yes (matched "*") >>> routed by dnslookup router >>> ----------- end verify ------------ >>> deny: condition test failed in ACL "check_rcpt" diff --git a/test/stderr/0361 b/test/stderr/0361 index 5081d02d7..cd96418fe 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -96,15 +96,20 @@ recurse.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? yes (end of l calling r1 router r1 router called for kilos@recurse.test.ex domain = recurse.test.ex +recurse.test.ex in "*"? yes (matched "*") DNS lookup of recurse.test.ex (MX) using fakens DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND returning DNS_NOMATCH +faking res_search(MX) response length as 65535 writing neg-cache entry for recurse.test.ex-MX-xxxx, ttl 3000 r1 router widened recurse.test.ex to recurse.test.ex.test.ex +recurse.test.ex.test.ex in "*"? yes (matched "*") DNS lookup of recurse.test.ex.test.ex (MX) using fakens DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3000 +recurse.test.ex.test.ex (MX resp) DNSSEC DNS lookup of recurse.test.ex.test.ex (A) using fakens DNS lookup of recurse.test.ex.test.ex (A) succeeded fully qualified name = recurse.test.ex.test.ex diff --git a/test/stderr/0402 b/test/stderr/0402 index 314a8ba3a..a469f8aae 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -1,6 +1,7 @@ Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed @@ -119,18 +120,6 @@ Data file written for message 10HmaX-0005vi-00 ├──expanding: ($tls_in_ver) ├─────result: () ╰───skipping: result is not used - ├──condition: def:tls_in_cipher_std - ├─────result: false - ╭───scanning: tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: tls $tls_in_cipher_std - - ├─────result: tls - - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -189,6 +178,7 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config trusted user admin user diff --git a/test/stderr/0419 b/test/stderr/0419 index 8aba8f1e4..39c797009 100644 --- a/test/stderr/0419 +++ b/test/stderr/0419 @@ -22,6 +22,7 @@ mxt13.test.ex in "! +local_domains"? yes (end of list) calling dnslookup router dnslookup router called for k@mxt13.test.ex domain = mxt13.test.ex +mxt13.test.ex in "*"? yes (matched "*") DNS lookup of mxt13.test.ex (MX) using fakens DNS lookup of mxt13.test.ex (MX) succeeded DNS lookup of other1.test.ex (A) using fakens @@ -46,6 +47,6 @@ domain = mxt13.test.ex routed by dnslookup router envelope to: k@mxt13.test.ex transport: smtp - host other1.test.ex [V4NET.12.4.5] MX=4 + host other1.test.ex [V4NET.12.4.5] MX=4 dnssec=no search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0426 b/test/stderr/0426 index dda5191a2..4e49b7114 100644 --- a/test/stderr/0426 +++ b/test/stderr/0426 @@ -26,6 +26,7 @@ local_part=x domain=uppercase.test.ex calling r1 router r1 router called for x@uppercase.test.ex domain = uppercase.test.ex +uppercase.test.ex (MX resp) DNSSEC local host found for non-MX address fully qualified name = UpperCase.test.ex uppercase.test.ex 127.0.0.1 mx=-1 sort=xx diff --git a/test/stderr/0443 b/test/stderr/0443 index 9b863225c..2911efa80 100644 --- a/test/stderr/0443 +++ b/test/stderr/0443 @@ -12,6 +12,7 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@ten-1.test.ex >>> calling r1 router +>>> ten-1.test.ex in "*"? yes (matched "*") >>> routed by r1 router >>> Attempting full verification using callout >>> callout cache: no domain record found for ten-1.test.ex diff --git a/test/stderr/0463 b/test/stderr/0463 index 4dc214435..c74dc0349 100644 --- a/test/stderr/0463 +++ b/test/stderr/0463 @@ -19,16 +19,20 @@ checking domains DNS lookup of ten-1 (MX) using fakens DNS lookup of ten-1 (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for ten-1-MX-xxxx, ttl 3000 Address records are not being sought ten-1 in "!@mx_any"? yes (end of list) calling all router all router called for x@ten-1 domain = ten-1 +ten-1 in "*"? yes (matched "*") DNS lookup of ten-1 (MX) using fakens DNS lookup of ten-1 (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for ten-1-MX-xxxx, ttl 3000 +ten-1 (MX resp) DNSSEC DNS lookup of ten-1 (A) using fakens DNS lookup of ten-1 (A) succeeded fully qualified name = ten-1.test.ex @@ -46,16 +50,20 @@ checking domains DNS lookup of ten-1.test.ex (MX) using fakens DNS lookup of ten-1.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000 Address records are not being sought ten-1.test.ex in "!@mx_any"? yes (end of list) calling all router all router called for x@ten-1.test.ex domain = ten-1.test.ex +ten-1.test.ex in "*"? yes (matched "*") DNS lookup of ten-1.test.ex (MX) using fakens DNS lookup of ten-1.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for ten-1.test.ex-MX-xxxx, ttl 3000 +ten-1.test.ex (MX resp) DNSSEC DNS lookup of ten-1.test.ex (A) using fakens DNS lookup of ten-1.test.ex (A) succeeded fully qualified name = ten-1.test.ex diff --git a/test/stderr/0469 b/test/stderr/0469 index bf37946ac..9f9e1538e 100644 --- a/test/stderr/0469 +++ b/test/stderr/0469 @@ -18,6 +18,7 @@ local_part=x domain=mxt1c.test.ex calling r1 router r1 router called for x@mxt1c.test.ex domain = mxt1c.test.ex +mxt1c.test.ex in "*"? yes (matched "*") DNS lookup of mxt1c.test.ex (MX) using fakens DNS lookup of mxt1c.test.ex (MX) succeeded DNS lookup of dontqualify (A) using fakens diff --git a/test/stderr/0476 b/test/stderr/0476 index 140ab775e..9c6466e9d 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -88,12 +88,12 @@ LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@the.local.host.name: result DEFER added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 -set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish all IP addresses skipped or deferred at least one address updating wait-t1 database added to list for 127.0.0.1 Leaving t1 transport set_process_info: pppp delivering 10HmaZ-0005vi-00 (just run t1 for CALLER@the.local.host.name in subprocess) +set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaZ-0005vi-00 LOG: MAIN == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused diff --git a/test/stderr/0513 b/test/stderr/0513 index dc2bfa520..60d05a6b3 100644 --- a/test/stderr/0513 +++ b/test/stderr/0513 @@ -16,6 +16,7 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing x@mxt2.test.ex >>> calling r1 router +>>> mxt2.test.ex in "*"? yes (matched "*") >>> r1 router declined for x@mxt2.test.ex >>> no more routers >>> ----------- end verify ------------ diff --git a/test/stderr/0544 b/test/stderr/0544 index 4d05db641..4f4e07b02 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -1,4 +1,5 @@ Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user ╭considering: ${tod_full} @@ -84,18 +85,6 @@ admin user ├──expanding: ($tls_in_ver) ├─────result: () ╰───skipping: result is not used - ├──condition: def:tls_in_cipher_std - ├─────result: false - ╭───scanning: tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: tls $tls_in_cipher_std - - ├─────result: tls - - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -131,6 +120,7 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config trusted user admin user @@ -176,6 +166,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN diff --git a/test/stderr/0545 b/test/stderr/0545 index d9987696f..f2e5e37b1 100644 --- a/test/stderr/0545 +++ b/test/stderr/0545 @@ -18,13 +18,16 @@ local_part=userx domain=alias-eximtesthost calling dns router dns router called for userx@alias-eximtesthost domain = alias-eximtesthost +alias-eximtesthost in "*"? yes (matched "*") DNS lookup of alias-eximtesthost (MX) using fakens DNS lookup of alias-eximtesthost (MX) succeeded CNAME found: change to eximtesthost.test.ex DNS lookup of eximtesthost.test.ex (MX) using fakens DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000 +alias-eximtesthost (MX resp) DNSSEC DNS lookup of alias-eximtesthost (A) using fakens DNS lookup of alias-eximtesthost (A) succeeded CNAME found: change to eximtesthost.test.ex @@ -45,6 +48,7 @@ local_part=userx domain=alias-eximtesthost.test.ex calling dns router dns router called for userx@alias-eximtesthost.test.ex domain = alias-eximtesthost.test.ex +alias-eximtesthost.test.ex in "*"? yes (matched "*") DNS lookup of alias-eximtesthost.test.ex (MX) using fakens DNS lookup of alias-eximtesthost.test.ex (MX) succeeded CNAME found: change to eximtesthost.test.ex @@ -89,13 +93,16 @@ local_part=userx domain=alias-eximtesthost.test.ex calling dns router dns router called for userx@alias-eximtesthost.test.ex domain = alias-eximtesthost.test.ex +alias-eximtesthost.test.ex in "*"? yes (matched "*") DNS lookup of alias-eximtesthost.test.ex (MX) using fakens DNS lookup of alias-eximtesthost.test.ex (MX) succeeded CNAME found: change to eximtesthost.test.ex DNS lookup of eximtesthost.test.ex (MX) using fakens DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000 +alias-eximtesthost.test.ex (MX resp) DNSSEC DNS lookup of alias-eximtesthost.test.ex (A) using fakens DNS lookup of alias-eximtesthost.test.ex (A) succeeded CNAME found: change to eximtesthost.test.ex diff --git a/test/stderr/0606 b/test/stderr/0606 index ddaacf431..cc24461c9 100644 --- a/test/stderr/0606 +++ b/test/stderr/0606 @@ -12,7 +12,8 @@ >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing should_log@delay1500.test.ex >>> calling all router -LOG: Long name lookup for 'delay1500.test.ex': ssss msec +>>> delay1500.test.ex in "*"? yes (matched "*") +LOG: Long A lookup for 'delay1500.test.ex': ssss msec >>> local host found for non-MX address >>> routed by all router >>> ----------- end verify ------------ @@ -32,6 +33,7 @@ LOG: Long name lookup for 'delay1500.test.ex': ssss msec >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> >>> routing should_not_log@delay500.test.ex >>> calling all router +>>> delay500.test.ex in "*"? yes (matched "*") >>> local host found for non-MX address >>> routed by all router >>> ----------- end verify ------------ diff --git a/test/stderr/1006 b/test/stderr/1006 index d569343d0..4c88e098f 100644 --- a/test/stderr/1006 +++ b/test/stderr/1006 @@ -13,11 +13,13 @@ DNS lookup of 46.test.ex (A) succeeded DNS lookup of v6.test.ex (MX) using fakens DNS lookup of v6.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000 DNS lookup of v6.test.ex (AAAA) succeeded DNS lookup of v6.test.ex (A) using fakens DNS lookup of v6.test.ex (A) gave NO_DATA returning DNS_NODATA +faking res_search(A) response length as 65535 writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -33,10 +35,12 @@ DNS lookup of 46.test.ex (A) succeeded DNS lookup of v6.test.ex (MX) using fakens DNS lookup of v6.test.ex (MX) gave NO_DATA returning DNS_NODATA +faking res_search(MX) response length as 65535 writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000 DNS lookup of v6.test.ex (A) using fakens DNS lookup of v6.test.ex (A) gave NO_DATA returning DNS_NODATA +faking res_search(A) response length as 65535 writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2201 b/test/stderr/2201 index 23ac93746..23d3d6a5f 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -99,6 +99,7 @@ dnsdb key: unknown DNS lookup of unknown (TXT) using fakens DNS lookup of unknown (TXT) gave HOST_NOT_FOUND returning DNS_NOMATCH +faking res_search(TXT) response length as 65535 writing neg-cache entry for unknown-TXT-xxxx, ttl 3000 lookup failed unknown in "dnsdb;unknown"? no (end of list) diff --git a/test/stderr/3000 b/test/stderr/3000 index 9ba2a62a2..49b5e51b7 100644 --- a/test/stderr/3000 +++ b/test/stderr/3000 @@ -1,5 +1,6 @@ 1999-03-02 09:44:33 this is a warning at TESTSUITE/aux-fixed/3000.pl line 25. Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid diff --git a/test/stderr/3211 b/test/stderr/3211 index f68fdd8f4..2ae0bde59 100644 --- a/test/stderr/3211 +++ b/test/stderr/3211 @@ -15,6 +15,7 @@ >>> calling skipped router >>> skipped router declined for userx@test.again.dns >>> calling temp router +>>> test.again.dns in "*"? yes (matched "*") >>> test.again.dns in dns_again_means_nonexist? no (option unset) >>> temp router: defer for userx@test.again.dns >>> message: host lookup did not complete @@ -36,6 +37,7 @@ LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.d >>> routing r1-userx@test.again.dns >>> test.again.dns in "!testdb;fail"? yes (end of list) >>> calling r1 router +>>> test.again.dns in "*"? yes (matched "*") >>> test.again.dns in dns_again_means_nonexist? no (option unset) >>> r1 router: defer for r1-userx@test.again.dns >>> message: host lookup did not complete diff --git a/test/stderr/5410 b/test/stderr/5410 index 9953eee7c..b29fee2e7 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -1,4 +1,5 @@ Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -220,18 +221,6 @@ end of inline ACL: ACCEPT ├──expanding: ($tls_in_ver) ├─────result: () ╰───skipping: result is not used - ├──condition: def:tls_in_cipher_std - ├─────result: false - ╭───scanning: tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: tls $tls_in_cipher_std - - ├─────result: tls - - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -284,6 +273,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -473,18 +463,6 @@ end of inline ACL: ACCEPT ├──expanding: ($tls_in_ver) ├─────result: () ╰───skipping: result is not used - ├──condition: def:tls_in_cipher_std - ├─────result: false - ╭───scanning: tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: tls $tls_in_cipher_std - - ├─────result: tls - - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -537,6 +515,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -726,18 +705,6 @@ end of inline ACL: ACCEPT ├──expanding: ($tls_in_ver) ├─────result: () ╰───skipping: result is not used - ├──condition: def:tls_in_cipher_std - ├─────result: false - ╭───scanning: tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: tls $tls_in_cipher_std - - ├─────result: tls - - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) diff --git a/test/stderr/5420 b/test/stderr/5420 index d83254307..b06eb8d33 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -1,4 +1,5 @@ Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -221,18 +222,6 @@ end of inline ACL: ACCEPT ├──expanding: ($tls_in_ver) ├─────result: () ╰───skipping: result is not used - ├──condition: def:tls_in_cipher_std - ├─────result: false - ╭───scanning: tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: tls $tls_in_cipher_std - - ├─────result: tls - - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -285,6 +274,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -474,18 +464,6 @@ end of inline ACL: ACCEPT ├──expanding: ($tls_in_ver) ├─────result: () ╰───skipping: result is not used - ├──condition: def:tls_in_cipher_std - ├─────result: false - ╭───scanning: tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: tls $tls_in_cipher_std - - ├─────result: tls - - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -538,6 +516,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user in hosts_connection_nolog? no (option unset) @@ -727,18 +706,6 @@ end of inline ACL: ACCEPT ├──expanding: ($tls_in_ver) ├─────result: () ╰───skipping: result is not used - ├──condition: def:tls_in_cipher_std - ├─────result: false - ╭───scanning: tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: tls $tls_in_cipher_std - - ├─────result: tls - - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) diff --git a/test/stdout/0147 b/test/stdout/0147 index 32ccd8944..431221c89 100644 --- a/test/stdout/0147 +++ b/test/stdout/0147 @@ -23,7 +23,7 @@ no_check_local_user condition = debug_print = no_disable_logging -dnssec_request_domains = +dnssec_request_domains = * dnssec_require_domains = domains = driver = accept diff --git a/test/stdout/0190 b/test/stdout/0190 index a88a851b0..756f7f851 100644 --- a/test/stdout/0190 +++ b/test/stdout/0190 @@ -97,17 +97,17 @@ y@batch4 userx@bdomain1 router = r3, transport = smtp2 host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] - host 127.0.0.1 [127.0.0.1] + host 127.0.0.1 [127.0.0.1] host the.local.host.name [ip4.ip4.ip4.ip4] userx@bdomain2 router = r3, transport = smtp2 host the.local.host.name [ip4.ip4.ip4.ip4] - host 127.0.0.1 [127.0.0.1] + host 127.0.0.1 [127.0.0.1] host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] userx@bdomain3 router = r3, transport = smtp2 host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] - host 127.0.0.1 [127.0.0.1] + host 127.0.0.1 [127.0.0.1] host the.local.host.name [ip4.ip4.ip4.ip4] ******** SERVER ******** diff --git a/test/stdout/0350 b/test/stdout/0350 index d951172b7..120a1d4a8 100644 --- a/test/stdout/0350 +++ b/test/stdout/0350 @@ -1,4 +1,4 @@ xx@yy router = r1, transport = t1 - host 1.2.3.4 [1.2.3.4] + host 1.2.3.4 [1.2.3.4] host other2.test.ex [V4NET.12.3.2] diff --git a/test/stdout/0430 b/test/stdout/0430 index 7914594b4..1229b0ef8 100644 --- a/test/stdout/0430 +++ b/test/stdout/0430 @@ -48,7 +48,7 @@ x@manual.route router = r1, transport = t1 host ten-1.test.ex [V4NET.0.0.1] MX=5 host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5 - host ten-6.test.ex [V4NET.0.0.6] + host ten-6.test.ex [V4NET.0.0.6] x@manual.route is undeliverable: lowest numbered MX record points to local host x@random.manual.route cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router x@random.manual.route diff --git a/test/stdout/0442 b/test/stdout/0442 index 0b3a5a62a..12c761c90 100644 --- a/test/stdout/0442 +++ b/test/stdout/0442 @@ -8,7 +8,7 @@ no_check_local_user condition = debug_print = no_disable_logging -dnssec_request_domains = +dnssec_request_domains = * dnssec_require_domains = domains = driver = accept diff --git a/test/stdout/0572 b/test/stdout/0572 index 06cc972a1..4d428078f 100644 --- a/test/stdout/0572 +++ b/test/stdout/0572 @@ -41,7 +41,7 @@ data_timeout = 5m delay_after_cutoff dns_qualify_single no_dns_search_parents -dnssec_request_domains = +dnssec_request_domains = * dnssec_require_domains = dscp = fallback_hosts = @@ -78,7 +78,8 @@ OPT = # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/tls_conf_prefix" -keep_environment = PATH:SSLKEYLOGFILE:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys exim_path = TESTSUITE/eximdir/exim host_lookup_order = bydns spool_directory = TESTSUITE/spool @@ -119,7 +120,8 @@ OPT = # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/tls_conf_prefix" -keep_environment = PATH:SSLKEYLOGFILE:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys exim_path = TESTSUITE/eximdir/exim host_lookup_order = bydns spool_directory = TESTSUITE/spool diff --git a/test/stdout/0576 b/test/stdout/0576 index a15ecdd5d..0a0e014ee 100644 --- a/test/stdout/0576 +++ b/test/stdout/0576 @@ -29,7 +29,53 @@ 354 Enter message, ending with "." on a line by itself
250 OK id=10HmbA-0005vi-00
221 the.local.host.name closing connection
+### load messages +220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+250 Reset OK
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+221 the.local.host.name closing connection
+### default q + 0m sss 10HmbB-0005vi-00 <CALLER@the.local.host.name> + normal@test.ex + +### alternate q + 0m sss 10HmbC-0005vi-00 <CALLER@the.local.host.name> + alternate@test.ex + +Message 10HmbB-0005vi-00 +Message 10HmbC-0005vi-00 +### third q + 0m sss 10HmbB-0005vi-00 <CALLER@the.local.host.name> + normal@test.ex + + 0m sss 10HmbC-0005vi-00 <CALLER@the.local.host.name> + alternate@test.ex + +Message 10HmbB-0005vi-00 Message 10HmbC-0005vi-00 +### default q + 0m sss 10HmbB-0005vi-00 <CALLER@the.local.host.name> + normal@test.ex + + 0m sss 10HmbC-0005vi-00 <CALLER@the.local.host.name> + alternate@test.ex + +### alternate q +### third q ******** SERVER ******** ### default q ### alternate q +### load messages +### default q +### alternate q +### third q +### default q +### alternate q +### third q diff --git a/test/stdout/0577 b/test/stdout/0577 index 7a0cb7a82..a56ec1b62 100644 --- a/test/stdout/0577 +++ b/test/stdout/0577 @@ -4,7 +4,8 @@ # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/std_conf_prefix" # 1 "TESTSUITE/aux-var/tls_conf_prefix" -keep_environment = PATH:SSLKEYLOGFILE:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK +add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys exim_path = TESTSUITE/eximdir/exim host_lookup_order = bydns spool_directory = TESTSUITE/spool diff --git a/test/stdout/0904 b/test/stdout/0904 index dc6209432..88755665f 100644 --- a/test/stdout/0904 +++ b/test/stdout/0904 @@ -78,6 +78,18 @@ Connection request from [127.0.0.1] 220 Greetings EHLO testhost.test.ex 250-Hello there +250 CHUNKING +MAIL FROM:<> +250 OK +RCPT TO:<ebad@test.ex> +550 sorry, no +QUIT +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Greetings +EHLO testhost.test.ex +250-Hello there 250-PIPELINING 250 CHUNKING MAIL FROM:<> diff --git a/test/stdout/1006 b/test/stdout/1006 index 2657c47a9..1457c08d2 100644 --- a/test/stdout/1006 +++ b/test/stdout/1006 @@ -5,7 +5,7 @@ dnslookup@mx46.test.ex manualroute@test.ex router = r2, transport = smtp host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] - host 46.test.ex [V4NET.0.0.4] + host 46.test.ex [V4NET.0.0.4] dnslookup@v6.test.ex router = r1, transport = smtp host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] diff --git a/test/stdout/1009 b/test/stdout/1009 index 673bf0a2f..7e86fa182 100644 --- a/test/stdout/1009 +++ b/test/stdout/1009 @@ -1,7 +1,7 @@ x@46.test.ex router = r1, transport = t1 host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] - host 46.test.ex [V4NET.0.0.4] + host 46.test.ex [V4NET.0.0.4] x@mx46.test.ex router = r1, transport = t1 host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46 @@ -46,7 +46,7 @@ x@mx46.test.ex host 46.test.ex [V4NET.0.0.4] MX=46 x@mx46.test.ex router = r0, transport = t1 - host 46.test.ex [V4NET.0.0.4] + host 46.test.ex [V4NET.0.0.4] host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] x@mx46.test.ex router = r0, transport = t1 diff --git a/test/stdout/4950 b/test/stdout/4950 index 89a34ad49..12c77344b 100644 --- a/test/stdout/4950 +++ b/test/stdout/4950 @@ -14,4 +14,4 @@ userx@other1.test.ex userx@other99.test.ex cannot be resolved at this time: host non-exist.test.ex not found when translating other99.test.ex [V4NET.99.0.1] userx@other99.test.ex router = lookuphost, transport = smtp - host non-exist.test.ex [unknown] + host non-exist.test.ex [unknown] |