Merge branch 'master'

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

diff --git a/test/confs/0478 b/test/confs/0478
index 70314f0f17eb2488db67d0165ff96ef1e474e8ae..243e47b2aa22c77a8f2b68618dc0d22b0d940b75 100644 (file)
--- a/test/confs/0478
+++ b/test/confs/0478
@@ -3,12 +3,13 @@
 SERVER=
 
 exim_path = EXIM_PATH
 SERVER=
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 host_lookup_order = bydns

-rfc1413_query_timeout = 0s

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

+tls_advertise_hosts =

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


@@ -31,9 +32,8 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

-  hosts = ${if eq {$sender_host_address}{}{$local_part}{V4NET.0.0.2}}

   port = PORT_D
   port = PORT_D

-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
+  hosts = ${if eq {$sender_host_address}{}{$local_part}{V4NET.0.0.2}}

   allow_localhost
   connect_timeout = 1s
 
   allow_localhost
   connect_timeout = 1s