You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2022/12/08 18:53:56 UTC
svn commit: r1905867 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm
Author: sidney
Date: Thu Dec 8 18:53:56 2022
New Revision: 1905867
URL: http://svn.apache.org/viewvc?rev=1905867&view=rev
Log:
Bug 8087 - Fix bug that showed up in DMARC with some subdomains
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm?rev=1905867&r1=1905866&r2=1905867&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm Thu Dec 8 18:53:56 2022
@@ -343,9 +343,12 @@ sub _check_dmarc {
$result->reason->[0]{comment} eq 'too many policies') {
dbg("result: no policy available (too many policies)");
$pms->{dmarc_policy} = 'no policy available';
+ } elsif ($result->result eq 'pass') {
+ dbg("result: pass");
+ $pms->{dmarc_policy} = $result->published->p;
} elsif ($result->result ne 'none') {
dbg("result: $result->{result}, disposition: $result->{disposition}, dkim: $result->{dkim}, spf: $result->{spf} (spf: $spf_status, spf_helo: $spf_helo_status)");
- $pms->{dmarc_policy} = $result->published->p;
+ $pms->{dmarc_policy} = $result->disposition;
} else {
dbg("result: no policy available");
$pms->{dmarc_policy} = 'no policy available';