X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/431b736177e2cdfd0b4da4c8545d8b732286abe1..148d9d517265b06fee1ac15047040e3f1789f280:/test/confs/0139

diff --git a/test/confs/0139 b/test/confs/0139
index 2f844b5f0..5aaa61183 100644
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -1,12 +1,7 @@
 # Exim test configuration 0139
 
-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 -----
 
@@ -35,15 +30,16 @@ check_vrfy:
   warn    dnslists = rbl.test.ex!==127.0.0.1
   warn    dnslists = rbl.test.ex!==127.0.0.3
   warn    dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
+  warn    dnslists = rbl.test.ex
   accept
 
 check_mail:
   warn    dnslists = rbl4.test.ex&0.0.0.6
   warn    dnslists = rbl4.test.ex&127.0.0.3
   warn    dnslists = rbl4.test.ex!&0.0.0.7
-          add_header = DNSlist: $dnslist_domain $dnslist_text
+          add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched
   warn    dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
-          add_header = DNSlist: $dnslist_domain $dnslist_text
+          add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched
   accept
 
 check_recipient:
@@ -85,7 +81,7 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   return_path_add
   user = CALLER