DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0497

diff --git a/test/confs/0497 b/test/confs/0497
index 4777bd20de63aff13f801a58356ba6e0c4111017..c1c866e279d68643749bff4800a3666515cfa8f8 100644 (file)
--- a/test/confs/0497
+++ b/test/confs/0497
@@ -1,13 +1,8 @@
 # Exim test configuration 0497
 
-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 -----
 
@@ -17,6 +12,11 @@ gecos_name = CALLER_NAME
 
 begin routers
 
+r0:
+  driver = redirect
+  senders = :
+  data = :blackhole: discard bounces
+
 r1:
   driver = accept
   transport = t1
@@ -30,6 +30,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen = :
   allow_localhost
 
 
@@ -37,7 +38,10 @@ t1:
 
 begin retry
 
+*  lost_connection
+*  mail_4xx
 *  rcpt_4xx
+*  data_4xx
 *  *         F,1d,15m