Revert "DKIM: reduce memory usage"

[users/heiko/exim.git] / test / confs / 5840

diff --git a/test/confs/5840 b/test/confs/5840
index c381ef616709884384b85cc0e748ac27be13a960..ac3578dc9a3ca113814ac3d625083433ecaef9fe 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -1,24 +1,22 @@
-# Exim test configuration 5850
+# Exim test configuration 5840
 # DANE
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-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
 
-queue_only
 queue_run_in_order
 
 tls_advertise_hosts = *
@@ -28,18 +26,17 @@ CDIR1 = DIR/aux-fixed
 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 
 tls_certificate = ${if eq {SERVER}{server} \
-       {${if eq {DETAILS}{ta} \
+       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \
                {CDIR2/fullchain.pem}\
                {CDIR1/cert1}}}\
        fail}
 
 tls_privatekey = ${if eq {SERVER}{server} \
-       {${if eq {DETAILS}{ta} \
+       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \
                {CDIR2/server1.example.com.unlocked.key}\
                {CDIR1/cert1}}}\
        fail}
 
-
 # ----- Routers -----
 
 begin routers
@@ -50,6 +47,7 @@ client:
   dnssec_request_domains = *
   self = send
   transport = send_to_server
+  errors_to = ""
 
 server:
   driver = redirect
@@ -65,8 +63,12 @@ send_to_server:
   allow_localhost
   port = PORT_D
 
-#  hosts_try_dane = *
-  hosts_require_dane = *
+  hosts_try_dane =     *
+  hosts_require_dane = !thishost.test.ex
+  tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
+  tls_try_verify_hosts = thishost.test.ex
+  tls_verify_certificates = CDIR2/ca_chain.pem
+
 
 
 # ----- Retry -----