Merge branch 'master'

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

diff --git a/test/confs/5840 b/test/confs/5840
index 0447ce36dae3989601bb8ca203edc59571e72b66..e83919005e28cf4100e2b31bd84bbfe92c3940ae 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -4,6 +4,7 @@
 SERVER=
 
 exim_path = EXIM_PATH
 SERVER=
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool


@@ -66,12 +67,8 @@ send_to_server:
   allow_localhost
   port = PORT_D
 
   allow_localhost
   port = PORT_D
 

-  hosts_verify_avoid_tls = :

   hosts_try_dane =     *
   hosts_require_dane = !thishost.test.ex
   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
   tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
   tls_try_verify_hosts = thishost.test.ex
   tls_verify_certificates = CDIR2/ca_chain.pem