You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2021/08/12 06:26:27 UTC
svn commit: r1892255 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Dmarc.pm
Author: gbechis
Date: Thu Aug 12 06:26:27 2021
New Revision: 1892255
URL: http://svn.apache.org/viewvc?rev=1892255&view=rev
Log:
make the check work even if Dkim is not available
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=1892255&r1=1892254&r2=1892255&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Dmarc.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Dmarc.pm Thu Aug 12 06:26:27 2021
@@ -99,7 +99,7 @@ sub set_config {
=item dmarc_save_reports ( 0 | 1 ) (default: 0)
-Store DMARC reports using Mail::Dmarc::Store, mail-dmarc.ini must be configured to save and send DMARC reports.
+Store DMARC reports using Mail::DMARC::Store, mail-dmarc.ini must be configured to save and send DMARC reports.
=back
@@ -217,7 +217,6 @@ sub _check_dmarc {
$dmarc = Mail::DMARC::PurePerl->new();
$lasthop = $pms->{relays_external}->[0];
- return if ( not ref($pms->{dkim_verifier}));
return if ( $pms->get('From:addr') !~ /\@/ );
$spf_status = 'pass' if ((defined $pms->{spf_pass}) and ($pms->{spf_pass} eq 1));
@@ -237,7 +236,7 @@ sub _check_dmarc {
return if not defined $mfrom_domain;
$dmarc->source_ip($lasthop->{ip});
$dmarc->header_from_raw($pms->get('From:addr'));
- $dmarc->dkim($pms->{dkim_verifier});
+ $dmarc->dkim($pms->{dkim_verifier}) if (ref($pms->{dkim_verifier}));
eval {
$dmarc->spf([
{