Mailing List Archive

Author: gbechis
Date: Thu Feb 8 11:42:00 2024
New Revision: 1915645

URL: http://svn.apache.org/viewvc?rev=1915645&view=rev
Log:
fix FORGED_HOTMAIL_RCVD2 after recent Microsoft changes

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1915645&r1=1915644&r2=1915645&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Thu Feb 8 11:42:00 2024
@@ -241,7 +241,7 @@ sub _check_for_forged_hotmail_received_h
{ return; }
if ($rcvd =~ /from \S*\.outbound\.protection\.outlook\.com \(\S+\.outbound\.protection\.outlook\.com[ \)]/ && $orig)
{ return; }
- if ($rcvd =~ /from \S*\.eurprd\d+\.prod\.outlook\.com \($IP_ADDRESS\)/ && $orig)
+ if ($rcvd =~ /from \S*\.(?:eur|nam)prd\d+\.prod\.outlook\.com \($IP_ADDRESS\)/ && $orig)
{ return; }
if ($rcvd =~ /from \S*\.hotmail.com \(\[$IP_ADDRESS\][ \):]/ && $ip)
{ return; }