Fix local delivery delay when combined with remote callout/hold. Bug 2599

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

diff --git a/test/confs/5410 b/test/confs/5410
index aff16fad4b6a3467de7fb64152a66c9a0fc1a8e7..c56b4624d507022182f286c7b6c909b9b048f252 100644 (file)
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -1,19 +1,14 @@
-# Exim test configuration 5402
+# Exim test configuration 5410
+
+.include DIR/aux-var/tls_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
 log_selector =  +smtp_confirmation
 tls_advertise_hosts = *
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1
 
 domainlist local_domains = test.ex : *.test.ex
 
@@ -52,7 +47,11 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_D
-  hosts_avoid_tls = ${if eq {$address_data}{usery}{*}{:}}
+  hosts_try_fastopen = :
+  hosts_avoid_tls =        ${if eq {$address_data}{usery}{*}{:}}
+  hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}}
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :
 
 
 # End