Mailing List Archive

Author: dos
Date: Tue Oct 3 15:55:05 2006
New Revision: 452666

URL: http://svn.apache.org/viewvc?view=rev&rev=452666
Log:
bug 5111: fix FORGED_JUNO_RCVD FP on webmail from untd.com's own systems

Modified:
spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm

Modified: spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&rev=452666&r1=452665&r2=452666
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin/EvalTests.pm Tue Oct 3 15:55:05 2006
@@ -587,9 +587,14 @@
&& $rcvd !~ / cookie\.(?:juno|untd)\.com /) { return 1; }
if($xmailer !~ /Juno /) { return 1; }
} else {
- if($rcvd !~ /from.*\bmail\.com.*\[$IP_ADDRESS\].*by/) { return 1; }
+ if($rcvd =~ /from.*\bmail\.com.*\[$IP_ADDRESS\].*by/) {
+ if($xmailer !~ /\bmail\.com/) { return 1; }
+ } elsif($rcvd =~ /from (webmail\S+\.untd\.com) \(\1 \[$IP_ADDRESS\]\) by/) {
+ if($xmailer !~ /^Webmail Version \d/) { return 1; }
+ } else {
+ return 1;
+ }
if($xorig !~ /$IP_ADDRESS/) { return 1; }
- if($xmailer !~ /\bmail\.com/) { return 1; }
}

return 0;