From cc55f4208e997ee8cdd87bf2a141be0c615488f9 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 7 Nov 2017 21:40:19 +0000
Subject: DKIM: make verification results visible in data ACL

---
 doc/doc-docbook/spec.xfpt | 11 +++++++++--
 doc/doc-txt/NewStuff      |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 98986e032..1a7a7baa6 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -11665,8 +11665,11 @@ contain the trailing slash. If &$config_file$& does not contain a slash,
 .vindex "&$config_file$&"
 The name of the main configuration file Exim is using.
 
+.vitem &$dkim_verify_status$& &&&
+Results of DKIM verification.
+For details see chapter &<<CHAPdkim>>&.
+
 .vitem &$dkim_cur_signer$& &&&
-       &$dkim_verify_status$& &&&
        &$dkim_verify_reason$& &&&
        &$dkim_domain$& &&&
        &$dkim_identity$& &&&
@@ -38717,7 +38720,8 @@ an identity. This is one of the list items from the expanded main option
 &%dkim_verify_signers%& (see above).
 
 .vitem &%$dkim_verify_status%&
-A string describing the general status of the signature. One of
+Within the DKIM ACL,
+a string describing the general status of the signature. One of
 .ilist
 &%none%&: There is no signature in the message for the current domain or
 identity (as reflected by &%$dkim_cur_signer%&).
@@ -38742,6 +38746,9 @@ hash-method or key-size:
 	set dkim_verify_status = fail
 	set dkim_verify_reason = hash too weak
 .endd
+
+After all the DKIM ACL runs have completed, the value becomes a
+colon-separated list of the values after each run.
 .wen
 
 .vitem &%$dkim_verify_reason%&
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index aa2117e7e..4261beb76 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -55,7 +55,8 @@ Version 4.90
     DKIM support for multiple hashes, and for alternate-identity tags.
     Builtin macro with default list of signed headers.
     Better syntax for specifying oversigning.
-    The DKIM ACL can override verification results.
+    The DKIM ACL can override verification status, and status is visible in
+    the data ACL.
 
 14. Exipick understands -C|--config for an alternative Exim
     configuration file.
-- 
cgit v1.2.3