Fix mis-merge

[exim.git] / test / confs / 0548

diff --git a/test/confs/0548 b/test/confs/0548
index 0f990c31a0a6a9f8fc641f0e4546a30d86c6f6dc..3e1f0ebfc5e8335e9941085d6309894da75296da 100644 (file)
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -2,13 +2,8 @@
 
 SERVER=
 
-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
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -49,14 +44,13 @@ smtp:
   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
 
-thishost.test.ex  *  F,15s,1s
+thishost.test.ex  *  F,20s,2s
 *                 *  F,1s,1s; F,1s,5s
 
 # End