Merge branch '4.next'

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

diff --git a/test/confs/0518 b/test/confs/0518
index b30acf42eeec31e4a34a66085dcf9253d41665b6..1e6dd2277605c56f7ca3694af5ce3d854d0a84a6 100644 (file)
--- a/test/confs/0518
+++ b/test/confs/0518
@@ -1,14 +1,8 @@
 # Exim test configuration 0518
 
 # Exim test configuration 0518
 

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

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -46,6 +40,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   rcpt_include_affixes
 
   allow_localhost
   rcpt_include_affixes
 


@@ -53,6 +48,7 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
 
 # End
   allow_localhost
 
 # End