DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 4500

diff --git a/test/confs/4500 b/test/confs/4500
index a952758ae89862ea139c30acb22654b71c6c85c7..46cffa39a92122b64fe102ab777f9759f124c06c 100644 (file)
--- a/test/confs/4500
+++ b/test/confs/4500
@@ -10,9 +10,13 @@ primary_hostname = myhost.test.ex
 
 acl_smtp_rcpt = accept
 acl_smtp_dkim = check_dkim
 
 acl_smtp_rcpt = accept
 acl_smtp_dkim = check_dkim

-acl_smtp_data = accept logwrite = ${authresults {$primary_hostname}}
+acl_smtp_data = check_data

 
 log_selector = +dkim_verbose
 
 log_selector = +dkim_verbose

+dkim_verify_hashes = sha256 : sha512 : sha1
+.ifdef MSIZE
+dkim_verify_min_keysizes = MSIZE
+.endif

 
 queue_only
 queue_run_in_order
 
 queue_only
 queue_run_in_order


@@ -37,4 +41,10 @@ check_dkim:
   accept
 .endif
 
   accept
 .endif
 

+check_data:
+  warn         logwrite =      ${authresults {$primary_hostname}}
+  accept       dkim_status =   pass
+               logwrite =      dkim_status includes pass
+  accept       logwrite =      dkim_state DOES NOT include pass
+

 # End
 # End