[exim-cvs] DMARC: for version 1.4.x libraries, add selector …

Gitweb: https://git.exim.org/exim.git/commitdiff/f9c35778a660c11ba350f0dbfd9b012cf2295e26

Commit:     f9c35778a660c11ba350f0dbfd9b012cf2295e26
Parent:     3586c3794ff2df6724c92f41311d0109ca2e632d
Author:     Victor Ustugov <victor@???>
AuthorDate: Sat Aug 19 23:08:58 2023 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Aug 20 14:24:03 2023 +0100

    DMARC: for version 1.4.x libraries, add selector to dkim lines in history file
---
 src/src/dmarc.c  | 8 +++++++-
 test/stdout/4650 | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index 070885111..c8d3f37f0 100644
--- a/src/src/dmarc.c
+++ b/src/src/dmarc.c
@@ -492,7 +492,13 @@ The EDITME provides a DMARC_API variable */
        ves == PDKIM_VERIFY_INVALID_PUBKEY_IMPORT      ? ARES_RESULT_PERMERROR :
        ARES_RESULT_UNKNOWN :
       ARES_RESULT_UNKNOWN;
-    g = string_fmt_append(g, "dkim %s %d\n", sig->domain, dkim_ares_result);
+#if DMARC_API >= 100400
+    g = string_fmt_append(g,
+      "dkim %s %s %d\n", sig->domain, sig->selector, dkim_ares_result);
+#else
+    g = string_fmt_append(g,
+      "dkim %s %d\n", sig->domain, dkim_ares_result);
+#endif
     }
   dkim_history_buffer = string_from_gstring(g);

diff --git a/test/stdout/4650 b/test/stdout/4650
index fcdb257f2..1afe0217c 100644
--- a/test/stdout/4650
+++ b/test/stdout/4650
@@ -74,7 +74,7 @@ ipaddr ip4.ip4.ip4.ip4
from test.ex
mfrom bloggs.com
spf 6
-dkim test.ex 0
+dkim test.ex sel 0
pdomain test.ex
policy 15
rua -

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