Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / confs / 0548

diff --git a/test/confs/0548 b/test/confs/0548
index 0f990c31a0a6a9f8fc641f0e4546a30d86c6f6dc..faa1ffad36b9cedf59a4d96b8eb3b2c3283f1216 100644 (file)
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -4,11 +4,11 @@ SERVER=
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 
 exim_path = EXIM_PATH
 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 -----
 


@@ -49,14 +49,13 @@ smtp:
   hosts = HOSTIPV4 : thishost.test.ex
   allow_localhost
   port = PORT_D
   hosts = HOSTIPV4 : thishost.test.ex
   allow_localhost
   port = PORT_D

-  interface = ${if eq {$host_address}{127.0.0.1} {127.0.0.1}}

 
 
 # ----- Retry -----
 
 begin retry
 
 
 
 # ----- Retry -----
 
 begin retry
 

-thishost.test.ex  *  F,15s,1s
+thishost.test.ex  *  F,20s,2s

 *                 *  F,1s,1s; F,1s,5s
 
 # End
 *                 *  F,1s,1s; F,1s,5s
 
 # End