DMARC: for version 1.4.x libraries, add selector to dkim lines in history file

diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index 07088511190f4dc15f5eff446b364d54c48c90e2..c8d3f37f09f268e44d29f59bbcbbb575c99cf95a 100644 (file)
--- 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 fcdb257f2855997bc71e8de9937ee66166bd2ec8..1afe0217ce838cb83d4922185aa63130561a598d 100644 (file)
--- 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 -