DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0139

diff --git a/test/confs/0139 b/test/confs/0139
index 2f844b5f019513dfd0fb436ffd3fd1b89fd40298..34ebb911e22558fcfe188d39d092e4b64ca44d21 100644 (file)
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -1,17 +1,13 @@
 # Exim test configuration 0139
 
 # 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 -----
 
 domainlist local_domains = exim.test.ex
 trusted_users = CALLER
 
 # ----- Main settings -----
 
 domainlist local_domains = exim.test.ex
 trusted_users = CALLER

+hosts_require_helo =

 
 acl_smtp_helo = check_helo
 acl_smtp_rcpt = check_recipient
 
 acl_smtp_helo = check_helo
 acl_smtp_rcpt = check_recipient


@@ -35,15 +31,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!==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
   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
   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:
   accept
 
 check_recipient:


@@ -86,6 +83,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   return_path_add
   user = CALLER
 
   return_path_add
   user = CALLER