DNS: tag res_search() hack by lookup type in debug output; munge ipv6 lines in testsuite

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

diff --git a/test/confs/5410 b/test/confs/5410
index 576967cacb977d6ea124086542ee17fca9f1cdf8..96ec87496d6351f42aae94be11ec669fb3bb4629 100644 (file)
--- a/test/confs/5410
+++ b/test/confs/5410
@@ -1,13 +1,8 @@
 # Exim test configuration 5410
 
 # Exim test configuration 5410
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----
 


@@ -54,6 +49,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