Merge branch 'master'

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

diff --git a/test/confs/5410 b/test/confs/5410
index 576967cacb977d6ea124086542ee17fca9f1cdf8..4c59adb95b39f689ebd4673d6d4ae2aac1f0ddf5 100644 (file)
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -1,9 +1,9 @@
 # Exim test configuration 5410
 
 exim_path = EXIM_PATH
 # Exim test configuration 5410
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 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 = ""
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""


@@ -54,6 +54,7 @@ smtp:
   port = PORT_D
   hosts_avoid_tls =        ${if eq {$address_data}{usery}{*}{:}}
   hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}}
   port = PORT_D
   hosts_avoid_tls =        ${if eq {$address_data}{usery}{*}{:}}
   hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}}

+  tls_try_verify_hosts = :

 
 
 # End
 
 
 # End