Merge branch 'master'

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

diff --git a/test/confs/0540 b/test/confs/0540
index f9a23f306fd67dc537af8086cd96356491a306d9..b05108cf5fd78534e6ccf98a9474979921c64fdf 100644 (file)
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -1,13 +1,14 @@
 # Exim test configuration 0540
 
 exim_path = EXIM_PATH
 # Exim test configuration 0540
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 host_lookup_order = bydns
 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
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+tls_advertise_hosts =

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


@@ -41,7 +42,6 @@ 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

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


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