X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/281e72e46c44d316d47ed309dcb0d781a909a181..968178ac56100bcd7418b2dfc7e9224f977bb039:/test/confs/5840?ds=sidebyside

diff --git a/test/confs/5840 b/test/confs/5840
index 2c72b64c3..e83919005 100644
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -4,9 +4,9 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
@@ -14,7 +14,11 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
+.ifndef OPT
 acl_smtp_rcpt = accept
+.else
+acl_smtp_rcpt = accept verify = recipient/callout
+.endif
 
 log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified
 
@@ -65,9 +69,7 @@ send_to_server:
 
   hosts_try_dane =     *
   hosts_require_dane = !thishost.test.ex
-  hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \
-				 {= {0}{$tls_out_tlsa_usage}} } \
-                        {*}{}}
+  tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
   tls_try_verify_hosts = thishost.test.ex
   tls_verify_certificates = CDIR2/ca_chain.pem