Merge branch '4.next'

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

diff --git a/test/confs/0540 b/test/confs/0540
index f9a23f306fd67dc537af8086cd96356491a306d9..05329af89a071ae38a76911f812dab34f9e8e6f4 100644 (file)
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -1,13 +1,8 @@
 # Exim test configuration 0540
 
 # Exim test configuration 0540
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_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 -----
 


@@ -41,7 +36,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

-  interface = 127.0.0.1
+  hosts_try_fastopen = :

   allow_localhost
   helo_data = ${if eq{$domain}{yes1}{localhost}{aname}}
 
   allow_localhost
   helo_data = ${if eq{$domain}{yes1}{localhost}{aname}}
 


@@ -49,7 +44,6 @@ t2:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S

-  interface = 127.0.0.1

   allow_localhost
 
 # End
   allow_localhost
 
 # End