Merge from master into 4.next

[exim.git] / test / confs / 0388

diff --git a/test/confs/0388 b/test/confs/0388
index 4c8f2f88d37190ca1e8876d4eaab753d8b86d857..9a7be305d62883809ed0041dd519f3852144c774 100644 (file)
--- a/test/confs/0388
+++ b/test/confs/0388
@@ -1,13 +1,8 @@
 # Exim test configuration 0388
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 -----
 
@@ -36,7 +31,6 @@ smtp:
   driver = smtp
   hosts_max_try = 1
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
   connect_timeout = 2s
   address_retry_include_sender = false