Merge branch 'master' into 4.next

[exim.git] / test / confs / 0197

diff --git a/test/confs/0197 b/test/confs/0197
index 32760b5a17a6946a745b2813641f73b16d5a2a3b..c2e4a10e8e654995eb83aa23a83f4aa11bc4b400 100644 (file)
--- a/test/confs/0197
+++ b/test/confs/0197
@@ -3,13 +3,8 @@
 # Remove connection timeout when copying for real use,
 # and these settings.
 
 # Remove connection timeout when copying for real use,
 # and these settings.
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+

 
 queue_run_in_order
 trusted_users = CALLER
 
 queue_run_in_order
 trusted_users = CALLER


@@ -100,6 +95,7 @@ makecopy:
 
 pass_on:
   driver = smtp
 
 pass_on:
   driver = smtp

+  hosts_try_fastopen = :

   connect_timeout = 1s
 
 
   connect_timeout = 1s