Diff of /spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

Parent Directory | Revision Log | Patch

--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	2005/09/22 07:32:36	290903
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	2005/09/22 07:37:12	290904
@@ -927,7 +927,8 @@ sub _check_whitelist_rcvd {
   }
   # 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}});
   }