diff options
| author | Victor Ustugov <victor@corvax.kiev.ua> | 2023-08-19 23:08:58 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2023-08-20 14:24:03 +0100 |
| commit | f9c35778a660c11ba350f0dbfd9b012cf2295e26 (patch) | |
| tree | 1af1acd9473a0299bb498256db31c4801f9a16e5 | |
| parent | 3586c3794ff2df6724c92f41311d0109ca2e632d (diff) | |
DMARC: for version 1.4.x libraries, add selector to dkim lines in history file
| -rw-r--r-- | src/src/dmarc.c | 8 | ||||
| -rw-r--r-- | 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 - |