X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/ee8b809061baea861fc87c41bcb72a62d76b0047..4ec0fcb6737da9bc2603056d56fbf6e41e061967:/test/confs/4060 diff --git a/test/confs/4060 b/test/confs/4060 index 935d49fe1..191677073 100644 --- a/test/confs/4060 +++ b/test/confs/4060 @@ -3,6 +3,7 @@ CONTROL=* OPT= +CONNECTCOND= keep_environment = PATH exim_path = EXIM_PATH @@ -22,13 +23,19 @@ chunking_advertise_hosts = OPT tls_advertise_hosts = * tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} -# Avoid ECDHE key-exchange so that we can wireshark-decode +.ifdef _HAVE_DMARC +dmarc_tld_file = +.endif + +# Avoid ECDHE key-exchange so that we can wireshark-decode (not TLS1.3) .ifdef _HAVE_GNUTLS tls_require_ciphers = NORMAL:-KX-ALL:+RSA +.else +tls_require_ciphers = DEFAULT:!kECDHE .endif pipelining_connect_advertise_hosts = * -log_selector = +received_recipients +pipelining +log_selector = +received_recipients +millisec +pipelining queue_only acl_smtp_rcpt = accept @@ -52,6 +59,7 @@ begin transports smtp: driver = smtp + hosts_try_fastopen = CONNECTCOND hosts_pipe_connect = CONTROL tls_verify_hosts = tls_try_verify_hosts =