DKIM: with dkim_verify_minimal, avoid calling ACL after first pass

[exim.git] / test / confs / 4510

diff --git a/test/confs/4510 b/test/confs/4510
index f36b4df3d17369f51bfab78e2d2c43e80ce12611..6dab3663b5d93e245414b99394c9b3f0c4414432 100644 (file)
--- a/test/confs/4510
+++ b/test/confs/4510
@@ -11,7 +11,7 @@ primary_hostname = myhost.test.ex
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept logwrite = rcpt_acl: macro: _DKIM_SIGN_HEADERS
-acl_smtp_dkim = accept logwrite = dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+acl_smtp_dkim = check_dkim_sig
 acl_smtp_data = accept logwrite = data_acl: dkim status $dkim_verify_status
 
 dkim_verify_signers = $dkim_signers
@@ -24,6 +24,14 @@ DDIR=DIR/aux-fixed/dkim
 
 log_selector = -dkim +dkim_verbose +received_recipients
 
+# ----- ACL
+begin acl
+
+check_dkim_sig:
+  warn logwrite =      dkim_acl: signer: $dkim_cur_signer bits: $dkim_key_length \
+                               h=$dkim_headernames status: $dkim_verify_status
+  accept
+
 # ----- Routers
 
 begin routers