Merge branch '4.next'

[exim.git] / test / confs / 2016

diff --git a/test/confs/2016 b/test/confs/2016
index ef6e14463ff3e828762812b9c2837302b7360f26..ead3a903ba054ad0aed23a3ca80e2dbcb3e40832 100644 (file)
--- a/test/confs/2016
+++ b/test/confs/2016
@@ -1,12 +1,7 @@
 # Exim test configuration 2016
 
 # Exim test configuration 2016
 

-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
+

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -34,6 +29,7 @@ smtp:
   command_timeout = 1s
   hosts_require_tls = 127.0.0.1
   port = PORT_S
   command_timeout = 1s
   hosts_require_tls = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----