Hello,

please find attached a patchset to update/change the
dkim_sign_headers setting.

I have gone for a sanitize with minimal-changes approach:
a) Add List-Unsubscribe-Post:
b) Drop oversigning-if-missing oversigning for List-* and Resent-*, use
   "="-prefix (sign all occurences) instead
c) Also sanitize the behavior for the other headers, use '+'-prefix to
   sign these with oversigning.

Rationale
a) is about Bug 3153
b) allows mailing lists to be configured in a way that does *not* break
   existing DKIM signatures
c) would avoid client bugs that do the wrong thing if $mitm adds e.g. a
second Subject, displaying the new,evil (unsigned one) but checking the sig
against old original header. It seems to be a little bit safer with
little cost.

As a datapoint I have had a quick look what other actors are using (test
messages had no To but a Cc, except for m365 wgich had  a To)
Gmail:
Oversigning of a core set
(from:to::cc:subject:date:message-id:reply-to), also signs 
content-transfer-encoding:in-reply-to:references:mime-version

m365:
No oversigning at all, "To" is not signed:
 
From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADChec

icloud (apple)
also no oversigning, does not even sign Cc:
h=Content-Type:From:Mime-Version:Date:Subject:Message-Id:x-icloud-hme;

GMX
does use oversigning for almost everything
 (it is easy to read, the lower case versions are the
 oversigning records:
 
X-UI-Sender-Class:Date:From:To:Subject:Message-ID:References:MIME-Version:Content-Type:In-Reply-To:cc:content-transfer-encoding:content-type:date:from:message-id:mime-version:reply-to:subject:to;

>From which I would take away:
icloud and m365 are pretty much useless (Cc/To missing)
Both Google and GMX seem to have invested some thought into what to
oversign, however imho oversigning in-reply-to/references (especially
for the case of signing the lack of these headers) 

[I will probably send a followup with gfurther thoughts]

cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
>From beb061f9d258ba7613729ba718962e1f61bde11d Mon Sep 17 00:00:00 2001
From: Andreas Metzler <[email protected]>
Date: Wed, 13 Aug 2025 11:43:51 +0200
Subject: [PATCH 1/6] DKIM-sign List-Unsubscribe-Post by default

Bug 3153
---
 src/src/miscmods/pdkim/pdkim.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/src/miscmods/pdkim/pdkim.h b/src/src/miscmods/pdkim/pdkim.h
index 61ce692e4..823dc6f7a 100644
--- a/src/src/miscmods/pdkim/pdkim.h
+++ b/src/src/miscmods/pdkim/pdkim.h
@@ -32,19 +32,21 @@
                              "Content-Transfer-Encoding:Content-ID:"\
                              "Content-Description:Resent-Date:Resent-From:"\
                              "Resent-Sender:Resent-To:Resent-Cc:"\
                              "Resent-Message-ID:In-Reply-To:References:"\
                              "List-Id:List-Help:List-Unsubscribe:"\
+			     "List-Unsubscribe-Post:"\
                              "List-Subscribe:List-Post:List-Owner:List-Archive"
 
 #define PDKIM_OVERSIGN_HEADERS "+From:+Sender:+Reply-To:+Subject:+Date:"\
                              "+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:"\
                              "+Content-Transfer-Encoding:+Content-ID:"\
                              "+Content-Description:+Resent-Date:+Resent-From:"\
                              "+Resent-Sender:+Resent-To:+Resent-Cc:"\
                              "+Resent-Message-ID:+In-Reply-To:+References:"\
                              "+List-Id:+List-Help:+List-Unsubscribe:"\
+			     "+List-Unsubscribe-Post:"\
                              "+List-Subscribe:+List-Post:+List-Owner:+List-Archive"
 
 /* -------------------------------------------------------------------------- */
 /* Length of the preallocated buffer for the "answer" from the dns/txt
    callback function. This should match the maximum RDLENGTH from DNS. */
-- 
2.50.1

>From 1241e6b7ee1fc47ab353eb53cbba16886b64a491 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <[email protected]>
Date: Wed, 13 Aug 2025 11:51:02 +0200
Subject: [PATCH 2/6] Disable DKIM oversigning of empty Resent-*/List-* headers

---
 src/src/miscmods/pdkim/pdkim.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/src/miscmods/pdkim/pdkim.h b/src/src/miscmods/pdkim/pdkim.h
index 823dc6f7a..e8e912978 100644
--- a/src/src/miscmods/pdkim/pdkim.h
+++ b/src/src/miscmods/pdkim/pdkim.h
@@ -28,16 +28,17 @@
 #include "../hash.h"
 
 #define PDKIM_DEFAULT_SIGN_HEADERS "From:Sender:Reply-To:Subject:Date:"\
                              "Message-ID:To:Cc:MIME-Version:Content-Type:"\
                              "Content-Transfer-Encoding:Content-ID:"\
-                             "Content-Description:Resent-Date:Resent-From:"\
-                             "Resent-Sender:Resent-To:Resent-Cc:"\
-                             "Resent-Message-ID:In-Reply-To:References:"\
-                             "List-Id:List-Help:List-Unsubscribe:"\
-			     "List-Unsubscribe-Post:"\
-                             "List-Subscribe:List-Post:List-Owner:List-Archive"
+                             "Content-Description:Resent-Date:=Resent-From:"\
+                             "=Resent-Sender:=Resent-To:=Resent-Cc:"\
+                             "=Resent-Message-ID:In-Reply-To:References:"\
+                             "=List-Id:=List-Help:=List-Unsubscribe:"\
+			     "=List-Unsubscribe-Post:"\
+                             "=List-Subscribe:=List-Post:=List-Owner:"\
+			     "=List-Archive"
 
 #define PDKIM_OVERSIGN_HEADERS "+From:+Sender:+Reply-To:+Subject:+Date:"\
                              "+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:"\
                              "+Content-Transfer-Encoding:+Content-ID:"\
                              "+Content-Description:+Resent-Date:+Resent-From:"\
-- 
2.50.1

>From 09bafe0e56d053192e0ee5469b00227b1b54e837 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <[email protected]>
Date: Wed, 13 Aug 2025 11:55:00 +0200
Subject: [PATCH 3/6] Enable explicit oversigning by default

---
 src/src/miscmods/pdkim/pdkim.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/src/miscmods/pdkim/pdkim.h b/src/src/miscmods/pdkim/pdkim.h
index e8e912978..ae7ccec69 100644
--- a/src/src/miscmods/pdkim/pdkim.h
+++ b/src/src/miscmods/pdkim/pdkim.h
@@ -25,14 +25,14 @@
 #define PDKIM_H
 
 #include "../blob.h"
 #include "../hash.h"
 
-#define PDKIM_DEFAULT_SIGN_HEADERS "From:Sender:Reply-To:Subject:Date:"\
-                             "Message-ID:To:Cc:MIME-Version:Content-Type:"\
-                             "Content-Transfer-Encoding:Content-ID:"\
-                             "Content-Description:Resent-Date:=Resent-From:"\
+#define PDKIM_DEFAULT_SIGN_HEADERS "+From:+Sender:+Reply-To:+Subject:+Date:"\
+                             "+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:"\
+                             "+Content-Transfer-Encoding:+Content-ID:"\
+                             "+Content-Description:+Resent-Date:+=Resent-From:"\
                              "=Resent-Sender:=Resent-To:=Resent-Cc:"\
                              "=Resent-Message-ID:In-Reply-To:References:"\
                              "=List-Id:=List-Help:=List-Unsubscribe:"\
 			     "=List-Unsubscribe-Post:"\
                              "=List-Subscribe:=List-Post:=List-Owner:"\
-- 
2.50.1

>From 8c02bc1ae57302136d30c18dd7ce8fabfd88346e Mon Sep 17 00:00:00 2001
From: Andreas Metzler <[email protected]>
Date: Wed, 13 Aug 2025 12:00:43 +0200
Subject: [PATCH 4/6] Update DKIM rfc references (6376 instead of 4871)

---
 doc/doc-txt/OptionLists.txt | 2 +-
 src/src/EDITME              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 77e902a09..2ac1c28a6 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -173,11 +173,11 @@ delivery_date_add                    boolean         false         transports
 delivery_date_remove                 boolean         true          main
 dkim_canon                           string*         unset         smtp              4.70
 dkim_domain                          string list*    unset         smtp              4.72
 dkim_private_key                     string*         unset         smtp              4.70
 dkim_selector                        string*         unset         smtp              4.70
-dkim_sign_headers                    string*         (RFC4871)     smtp              4.70
+dkim_sign_headers                    string*         (content of _DKIM_SIGN_HEADERS)     smtp              4.70
 dkim_strict                          string*         unset         smtp              4.70
 dkim_timestamps                      integer*        unset         smtp              4.92
 dkim_verify_hashes                   string          sha256:sha512:sha1 main         4.93
 dkim_verify_keytypes                 string          ed25519:rsa        main         4.93
 dkim_verify_min_keysizes             string list     "rsa=1024 ed25519=250"  main    4.94
diff --git a/src/src/EDITME b/src/src/EDITME
index b9f881943..6fe4d6b48 100644
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -604,11 +604,11 @@ DISABLE_MAL_KAV=yes
 DISABLE_MAL_MKS=yes
 
 
 #------------------------------------------------------------------------------
 # If built with TLS, Exim includes code to support DKIM (DomainKeys Identified
-# Mail, RFC4871) signing and verification.  Verification of signatures is
+# Mail, RFC6376) signing and verification.  Verification of signatures is
 # turned on by default.  See the spec for information on conditionally
 # disabling it.  To disable the inclusion of the entire feature, set
 # DISABLE_DKIM to "yes"
 #
 # It is possible to build the support as a dynamic-load module. In addition
-- 
2.50.1

>From 1d7d61f5cf58ec6252abe53c84ab9b7acae4d74c Mon Sep 17 00:00:00 2001
From: Andreas Metzler <[email protected]>
Date: Wed, 13 Aug 2025 12:02:27 +0200
Subject: [PATCH 5/6] extend/update dkim_sign_headers documentation

---
 doc/doc-docbook/spec.xfpt | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index b73c39ba1..e1acf7e3e 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -42629,19 +42629,13 @@ either &"1"& or &"true"&, Exim will defer. Otherwise Exim will send the message
 unsigned. You can use the &%$dkim_domain%& and &%$dkim_selector%& expansion
 variables here.
 
 .option dkim_sign_headers smtp string&!! "see below"
 If set, this option must expand to a colon-separated
-list of header names.
+list of header names, each with or without  &"="& or a &"+"& prefixes.
 Headers with these names, or the absence of such a header, will be included
 in the message signature.
-When unspecified, the header names listed in
-&url(https://www.rfc-editor.org/rfc/rfc4871,RFC 4871) will be used,
-whether or not each header is present in the message.
-The default list is available for the expansion in the macro
-&"_DKIM_SIGN_HEADERS"&
-and an oversigning variant is in &"_DKIM_OVERSIGN_HEADERS"&.
 
 If a name is repeated, multiple headers by that name (or the absence thereof)
 will be signed.  The textually later headers in the headers part of the
 message are signed first, if there are multiples.
 
@@ -42650,10 +42644,38 @@ If an &"="& prefix is used, all headers that are present with this name
 will be signed.
 If a &"+"& prefix if used, all headers that are present with this name
 will be signed, and one signature added for a missing header with the
 name will be appended.
 
+The following table sums up whether exim uses DKIM oversigning (i.e. later
+addition of a(nother) header with this name invalidates the DKIM
+signature), assuming the respective header name is specified only once in
+in dkim_sign_headers:
+.itable all 0 0 2 30* left 70* left
+.irow	"&'Prefix'&"	"Oversigning"
+.irow	"&'none  '&"	"Yes, if header is not in present in message, no otherwise. - Only last occurence of header is signed"
+.irow	"&'+     '&"	"Yes"
+.irow	"&'=     '&"	"No, but all occurences of header signed"
+.endtable
+
+The default value is available for the expansion in the macro
+&"_DKIM_SIGN_HEADERS"&:
+.code
+exim -bP macro _DKIM_SIGN_HEADERS
+.endd
+This default is based on the suggestions in
+&url(https://www.rfc-editor.org/rfc/rfc6376,RFC 6376) with the addition of
+&"List-Unsubscribe-Post"&
+(&url(https://www.rfc-editor.org/rfc/rfc8058,RFC 8058)). Oversigning is
+used extensively and does not depend of the actual headers present but is
+set/unset explicitly with &'+'& or &'='&. Please note that
+&url(https://www.rfc-editor.org/rfc/rfc6376,RFC 6376) only provides rough
+guidance and the set of headers to be signed and the use of oversigning.
+
+The macro &"_DKIM_OVERSIGN_HEADERS"& contains the same list of headers but
+has oversigning (&'+'&) set for all of them (even for e.g. List-*).
+
 .option dkim_timestamps smtp integer&!! unset
 This option controls the inclusion of timestamp information in the signature.
 If not set, no such information will be included.
 Otherwise, must be an unsigned number giving an offset in seconds from the
 current time for the expiry tag (e.g. 1209600 for two weeks); both creation
-- 
2.50.1

>From 4b2494602869c22d4fcfddfa2f726b22d0b6b2f8 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <[email protected]>
Date: Wed, 13 Aug 2025 13:26:08 +0200
Subject: [PATCH 6/6] Update testsuite for changed dkim_sign_headers default

---
 test/log/4510 | 22 +++++++++++-----------
 test/log/4513 |  2 +-
 test/log/4514 |  2 +-
 test/log/4515 | 10 +++++-----
 test/log/4516 |  2 +-
 test/log/4530 | 20 ++++++++++----------
 test/log/4533 |  2 +-
 test/log/4534 |  2 +-
 test/log/4535 | 10 +++++-----
 test/log/4541 |  4 ++--
 test/log/4545 |  4 ++--
 11 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/test/log/4510 b/test/log/4510
index 052ce8cdc..d16b16fe9 100644
--- a/test/log/4510
+++ b/test/log/4510
@@ -37,75 +37,75 @@
 1999-03-02 09:44:33 10HmbQ-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] DKIM=test.ex:sel C="250 OK id=10HmbR-000000005vi-0000"
 1999-03-02 09:44:33 10HmbQ-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From status: pass
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => a <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From:From status: pass
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 t=T x=T+10 [verification succeeded]
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 => b <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From:From status: pass
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 t=T [verification succeeded]
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 => b02 <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From status: pass
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 => b10 <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=X-mine:X-mine:From status: pass
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 => b12 <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=X-Mine status: pass
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 => b20 <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=X-mine:X-mine:X-Mine status: pass
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 => b22 <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 DKIM: d=test.ex s=sel_bad [failed key import]
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 dkim_acl: signer: test.ex bits: 0 h=From status: invalid
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 DKIM: d=test.ex s=sel_bad c=relaxed/relaxed a=rsa-sha256 b=1024 [invalid - syntax error in public key record]
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 data_acl: dkim status invalid
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 => d <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 SMTP connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] lost while reading message data (header)
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbP-000000005vi-0000 data_acl: dkim status 
 1999-03-02 09:44:33 10HmbP-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbP-000000005vi-0000 => e <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbP-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbR-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From status: pass
 1999-03-02 09:44:33 10HmbR-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbR-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbR-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbR-000000005vi-0000 => f <[email protected]> R=server_store T=file
diff --git a/test/log/4513 b/test/log/4513
index 8905a27f3..466f32d5e 100644
--- a/test/log/4513
+++ b/test/log/4513
@@ -2,11 +2,11 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] DKIM=test.ex:sel C="250 OK id=10HmaY-000000005vi-0000"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From:From status: pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => a <[email protected]> R=server_store T=file
diff --git a/test/log/4514 b/test/log/4514
index eabf55bfe..2144a44a2 100644
--- a/test/log/4514
+++ b/test/log/4514
@@ -2,11 +2,11 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] DKIM=test.ex:ses:test.ex:sel C="250 OK id=10HmaY-000000005vi-0000"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 512 h=From:To:Subject status: pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: d=test.ex s=ses c=relaxed/relaxed a=rsa-sha256 b=512 [verification succeeded]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From:To:Subject status: pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 data_acl: dkim status pass:pass
diff --git a/test/log/4515 b/test/log/4515
index a5a519499..6a05dcadd 100644
--- a/test/log/4515
+++ b/test/log/4515
@@ -14,35 +14,35 @@
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbG-000000005vi-0000"
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => a <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 => b <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp K S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 => c <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 => b <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp K S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 => c <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 Completed
diff --git a/test/log/4516 b/test/log/4516
index 0aefc613a..9b5dd11eb 100644
--- a/test/log/4516
+++ b/test/log/4516
@@ -3,11 +3,11 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] DKIM=test.ex:sel C="250 OK id=10HmaY-000000005vi-0000"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: validation error: LONG_LINE
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: Error during validation, disabling signature verification: LONG_LINE
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 data_acl: dkim status 
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => a <[email protected]> R=server_store T=file
diff --git a/test/log/4530 b/test/log/4530
index 05f87d816..eda31876d 100644
--- a/test/log/4530
+++ b/test/log/4530
@@ -34,68 +34,68 @@
 1999-03-02 09:44:33 10HmbO-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DKIM=test.ex:sel C="250 OK id=10HmbP-000000005vi-0000"
 1999-03-02 09:44:33 10HmbO-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => a <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From:From
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 t=T x=T+10 [verification succeeded]
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 => b <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 => b10 <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=X-mine:X-mine:From
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 => b12 <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=X-Mine
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 => b20 <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=X-mine:X-mine:X-Mine
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 => b22 <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbJ-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 DKIM: d=test.ex s=sel_bad [failed key import]
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 dkim_acl: signer: test.ex bits: 0 h=From
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 DKIM: d=test.ex s=sel_bad c=relaxed/relaxed a=rsa-sha256 b=1024 [invalid - syntax error in public key record]
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 data_acl: dkim status invalid
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 => d <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbL-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 SMTP connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] lost while reading message data (header)
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 data_acl: dkim status 
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 => e <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbN-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbP-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbP-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbP-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbP-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbP-000000005vi-0000 => f <[email protected]> R=server_store T=file
diff --git a/test/log/4533 b/test/log/4533
index 202ab3890..6df5a4545 100644
--- a/test/log/4533
+++ b/test/log/4533
@@ -2,11 +2,11 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DKIM=test.ex:sel C="250 OK id=10HmaY-000000005vi-0000"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From:From
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha512 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => a <[email protected]> R=server_store T=file
diff --git a/test/log/4534 b/test/log/4534
index a3dcb6d15..47ca39047 100644
--- a/test/log/4534
+++ b/test/log/4534
@@ -2,11 +2,11 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DKIM=test.ex:ses:test.ex:sel C="250 OK id=10HmaY-000000005vi-0000"
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 512 h=From:To:Subject
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: d=test.ex s=ses c=relaxed/relaxed a=rsa-sha256 b=512 [verification succeeded]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From:To:Subject
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 data_acl: dkim status pass:pass
diff --git a/test/log/4535 b/test/log/4535
index 0e72fd255..de5fa538b 100644
--- a/test/log/4535
+++ b/test/log/4535
@@ -14,35 +14,35 @@
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmbG-000000005vi-0000"
 1999-03-02 09:44:33 10HmbF-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => a <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 => b <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx K S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 => c <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 => b <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 data acl: dkim status pass
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx K S=sss DKIM=test.ex [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 => c <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 Completed
diff --git a/test/log/4541 b/test/log/4541
index 7f1a65c01..a146a4967 100644
--- a/test/log/4541
+++ b/test/log/4541
@@ -5,21 +5,21 @@
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] DKIM=test.ex:sel:test.ex:sed C="250 OK id=10HmbA-000000005vi-0000"
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 253 h=From status: pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From status: pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 data_acl: dkim status pass:pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => a <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 dkim_acl: signer: test.ex bits: 253 h=From status: pass
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded]
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 => b <[email protected]> R=server_store T=file
diff --git a/test/log/4545 b/test/log/4545
index 20ae7cb9a..6a05dfd26 100644
--- a/test/log/4545
+++ b/test/log/4545
@@ -5,18 +5,18 @@
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => [email protected] R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] DKIM=test.ex:sed:test.ex:sel C="250 OK id=10HmbA-000000005vi-0000"
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 dkim_acl: signer: test.ex bits: 253 h=From:To:Subject status: pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 data_acl: dkim status pass
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= [email protected] H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss [email protected] for [email protected]
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => a <[email protected]> R=server_store T=file
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
-1999-03-02 09:44:33 rcpt_acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive
+1999-03-02 09:44:33 rcpt_acl: macro: +From:+Sender:+Reply-To:+Subject:+Date:+Message-ID:+To:+Cc:+MIME-Version:+Content-Type:+Content-Transfer-Encoding:+Content-ID:+Content-Description:+Resent-Date:+=Resent-From:=Resent-Sender:=Resent-To:=Resent-Cc:=Resent-Message-ID:In-Reply-To:References:=List-Id:=List-Help:=List-Unsubscribe:=List-Unsubscribe-Post:=List-Subscribe:=List-Post:=List-Owner:=List-Archive
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 dkim_acl: signer: test.ex bits: 253 h=From status: pass
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded]
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 dkim_acl: signer: test.ex bits: 1024 h=From status: pass
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 data_acl: dkim status pass:pass
-- 
2.50.1

-- 
## subscription configuration (requires account):
##   https://lists.exim.org/mailman3/postorius/lists/exim-dev.lists.exim.org/
## unsubscribe (doesn't require an account):
##   [email protected]
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/

Reply via email to