Mailing List Archive

Author: dos
Date: Thu Sep 22 00:37:12 2005
New Revision: 290904

URL: http://svn.apache.org/viewcvs?rev=290904&view=rev
Log:
bug 4425: whitelist_from_rcvd shouldn't look at trusted headers if untrusted ones exist

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?rev=290904&r1=290903&r2=290904&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Thu Sep 22 00:37:12 2005
@@ -927,7 +927,8 @@
}
# then try the trusted ones; the user could have whitelisted a trusted
# relay, totally permitted
- if ($self->{num_relays_trusted} > 0) {
+ # but do not do this if any untrusted relays, to avoid forgery -- bug 4425
+ if ($self->{num_relays_trusted} > 0 && !$self->{num_relays_untrusted} ) {
push (@relays, @{$self->{relays_trusted}});
}