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/11/30 07:22:58 UTC
svn commit: r1895420 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Dmarc.pm
Author: gbechis
Date: Tue Nov 30 07:22:58 2021
New Revision: 1895420
URL: http://svn.apache.org/viewvc?rev=1895420&view=rev
Log:
Don't trim spf domain in 'mfrom' scope
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=1895420&r1=1895419&r2=1895420&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Dmarc.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Dmarc.pm Tue Nov 30 07:22:58 2021
@@ -232,7 +232,7 @@ sub _check_dmarc {
$spf_helo_status = 'neutral' if ((defined $pms->{spf_helo_neutral}) and ($pms->{spf_helo_neutral} eq 1));
$spf_helo_status = 'softfail' if ((defined $pms->{spf_helo_softfail}) and ($pms->{spf_helo_softfail} eq 1));
- $mfrom_domain = $pms->get('EnvelopeFrom:domain');
+ $mfrom_domain = $pms->get('EnvelopeFrom:host');
return if not defined $mfrom_domain;
$dmarc->source_ip($lasthop->{ip});
$dmarc->header_from_raw($pms->get('From:addr'));