Merge branch 'master' into 4.next
[users/jgh/exim.git] / test / confs / 0160
index 637e642a94547d181b5eb9797a64c35ec827843b..68a5fe77a682fa7afb5a760a81678c3e9ace301a 100644 (file)
@@ -3,11 +3,11 @@
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 exim_path = EXIM_PATH
 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 -----
 
@@ -43,7 +43,7 @@ smtp:
 
 begin retry
 
 
 begin retry
 
-* * F,1s,1s
+* * F,2s,1s
 
 
 # End
 
 
 # End