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 2022/04/13 10:29:01 UTC
svn commit: r1899804 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Dmarc.pm
Author: gbechis
Date: Wed Apr 13 10:29:00 2022
New Revision: 1899804
URL: http://svn.apache.org/viewvc?rev=1899804&view=rev
Log:
fix error message handling
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=1899804&r1=1899803&r2=1899804&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Dmarc.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Dmarc.pm Wed Apr 13 10:29:00 2022
@@ -204,7 +204,7 @@ sub _check_dmarc {
my ($self,$pms,$name) = @_;
my $spf_status = 'none';
my $spf_helo_status = 'none';
- my ($dmarc, $lasthop, $result, $rua, $domain, $mfrom_domain);
+ my ($dmarc, $lasthop, $result, $rua, $mfrom_domain);
if (!HAS_DMARC) {
warn "check_dmarc not supported, required module Mail::DMARC::PurePerl missing\n";
@@ -257,8 +257,8 @@ sub _check_dmarc {
$result = $dmarc->validate();
};
if ($@) {
- if(defined $domain) {
- dbg("Dmarc error while evaluating domain $domain: $@");
+ if(defined $mfrom_domain) {
+ dbg("Dmarc error while evaluating domain $mfrom_domain: $@");
} else {
dbg("Dmarc error: $@");
}