Merge branch 'master' into 4.next

[exim.git] / test / confs / 0098

diff --git a/test/confs/0098 b/test/confs/0098
index deec607e914b406feefa6819815be0b0504bb05a..465c2310aea7b831c8b8fa6e77c607939f984b03 100644 (file)
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -2,13 +2,8 @@
 
 WMF=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -17,7 +12,10 @@ qualify_domain = test.ex
 domainlist local_domains = test.ex : another.test.ex
 
 delay_warning = 10s:40s:10m
+
+.ifndef DEFAULTDWC
 delay_warning_condition = ${if !eq{$domain}{another.test.ex}{yes}{no}}
+.endif
 
 log_selector = +subject