X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d4fd1b83a197d73cbac114fe53f3448d8b5c7cc2..d52a8ce8499fbb88f4670623df9f52d3e790292b:/test/confs/5820 diff --git a/test/confs/5820 b/test/confs/5820 index d4dce2f85..7ee165221 100644 --- a/test/confs/5820 +++ b/test/confs/5820 @@ -2,6 +2,7 @@ # DANE/GnuTLS SERVER= +CONTROL= * .include DIR/aux-var/tls_conf_prefix @@ -15,7 +16,8 @@ acl_smtp_rcpt = accept logwrite = "rcpt ACL" acl_smtp_rcpt = accept verify = recipient/callout .endif -log_selector = +received_recipients +tls_peerdn +tls_certificate_verified +log_selector = +received_recipients +tls_peerdn +tls_certificate_verified \ + +tls_sni queue_run_in_order @@ -64,13 +66,14 @@ begin transports send_to_server: driver = smtp allow_localhost - port = ${if match {$host}{\Ntest.ex$\N} {PORT_D}{25}} + port = PORT_D + hosts_try_fastopen = : - hosts_try_dane = * + hosts_try_dane = CONTROL hosts_require_dane = HOSTIPV4 tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}} tls_try_verify_hosts = thishost.test.ex - tls_verify_certificates = CDIR2/ca_chain.pem + tls_verify_certificates = ${if eq {DETAILS}{ca} {CDIR2/ca_chain.pem} {}}