DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 4500

diff --git a/test/confs/4500 b/test/confs/4500
index 502de4a1972dcecab3d0523ac126b44f503571c1..46cffa39a92122b64fe102ab777f9759f124c06c 100644 (file)
--- a/test/confs/4500
+++ b/test/confs/4500
@@ -13,6 +13,10 @@ acl_smtp_dkim = check_dkim
 acl_smtp_data = check_data
 
 log_selector = +dkim_verbose
+dkim_verify_hashes = sha256 : sha512 : sha1
+.ifdef MSIZE
+dkim_verify_min_keysizes = MSIZE
+.endif
 
 queue_only
 queue_run_in_order
@@ -38,6 +42,9 @@ check_dkim:
 .endif
 
 check_data:
-  accept logwrite = ${authresults {$primary_hostname}}
+  warn         logwrite =      ${authresults {$primary_hostname}}
+  accept       dkim_status =   pass
+               logwrite =      dkim_status includes pass
+  accept       logwrite =      dkim_state DOES NOT include pass
 
 # End