On 2021/05/04 16:55, Renaud Allard wrote: > Please consider the attached patch to solve the opendmarc issue. > Given that opendmarc broke their API and the new one has no documentation, > exim devs are currently checking what could be done, so this is not the > official patch from exim devs. I have tested it and got no issues so far. > > On 5/4/21 4:45 PM, Renaud Allard wrote: > > Indeed, probably, sorry for the noise. > > But I also saw we have an issue with opendmarc 1.4+. They changed the > > API... I am currently trying to find a solution. I had tested with the > > older version only on the build machine.
Hmm yes..committed here: https://github.com/trusteddomainproject/OpenDMARC/commit/dbd87868f2ca9c2ef11529cd757d1cc5ab228833 Are you happy enough with your patch or should I backout opendmarc? > Index: patches/patch-src_dmarc_c > =================================================================== > RCS file: patches/patch-src_dmarc_c > diff -N patches/patch-src_dmarc_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_dmarc_c 4 May 2021 14:51:38 -0000 > @@ -0,0 +1,14 @@ > +$OpenBSD$ > + > +Index: src/dmarc.c > +--- src/dmarc.c.orig > ++++ src/dmarc.c > +@@ -446,7 +446,7 @@ if (!dmarc_abort && !sender_host_authenticated) > + vs == PDKIM_VERIFY_INVALID ? > DMARC_POLICY_DKIM_OUTCOME_TMPFAIL : > + DMARC_POLICY_DKIM_OUTCOME_NONE; > + libdm_status = opendmarc_policy_store_dkim(dmarc_pctx, US sig->domain, > +- dkim_result, US""); > ++ sig->selector, dkim_result, > US""); > + DEBUG(D_receive) > + debug_printf("DMARC adding DKIM sender domain = %s\n", sig->domain); > + if (libdm_status != DMARC_PARSE_OKAY)