You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2004/09/09 00:37:15 UTC
svn commit: rev 43549 - spamassassin/trunk/lib/Mail/SpamAssassin
Author: jm
Date: Wed Sep 8 15:37:13 2004
New Revision: 43549
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Log:
bug 3740: ignore legit bounces from Yahoo, if the correct rDNS and From are used
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Wed Sep 8 15:37:13 2004
@@ -491,6 +491,13 @@
if ($self->gated_through_received_hdr_remover()) { return 0; }
+ # bug 3740: ignore bounces from Yahoo!. only honoured if the
+ # correct rDNS shows up in the trusted relay list, or first untrusted relay
+ if ($from eq 'MAILER-DAEMON@yahoo.com' &&
+ ($self->{relays_trusted_str} =~ / rdns=\S+\.yahoo\.com /
+ || $self->{relays_untrusted_str} =~ /^[^\]]+ rdns=\S+\.yahoo\.com /))
+ { return 0; }
+
if ($rcvd =~ /by web\S+\.mail\.yahoo\.com via HTTP/) { return 0; }
if ($rcvd =~ /by smtp\S+\.yahoo\.com with SMTP/) { return 0; }
my $IP_ADDRESS = IP_ADDRESS;