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 2007/01/01 23:40:54 UTC
svn commit: r491666 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Author: jm
Date: Mon Jan 1 14:40:53 2007
New Revision: 491666
URL: http://svn.apache.org/viewvc?view=rev&rev=491666
Log:
bug 5259: a bit I missed
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?view=diff&rev=491666&r1=491665&r2=491666
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Mon Jan 1 14:40:53 2007
@@ -82,19 +82,19 @@
my $in_trusted = 1;
my $in_internal = 1;
- if ($trusted->get_num_nets() > 0 && $internal->get_num_nets() > 0) {
+ if ($trusted->get_num_nets() > 1 && $internal->get_num_nets() > 1) {
# good; we can use both reliably.
}
- elsif ($trusted->get_num_nets() <= 0 && $internal->get_num_nets() > 0) {
+ elsif ($trusted->get_num_nets() <= 1 && $internal->get_num_nets() > 1) {
$trusted = $internal; # use 'internal' for 'trusted'
}
- elsif ($trusted->get_num_nets() > 0 && $internal->get_num_nets() <= 0) {
+ elsif ($trusted->get_num_nets() > 1 && $internal->get_num_nets() <= 1) {
# use 'trusted' for 'internal'; compatibility with SpamAssassin 2.60
$internal = $trusted;
}
- my $did_user_specify_trust = ($trusted->get_num_nets() > 0);
- my $did_user_specify_internal = ($internal->get_num_nets() > 0);
+ my $did_user_specify_trust = ($trusted->get_num_nets() > 1);
+ my $did_user_specify_internal = ($internal->get_num_nets() > 1);
my $IP_PRIVATE = IP_PRIVATE;
my $LOCALHOST = LOCALHOST;
@@ -146,8 +146,11 @@
}
} else {
# if the user didn't specify it, assume we immediately transition
- # to the external network (the internet) once we leave this host.
- $in_internal = 0;
+ # to the external network (the internet) once we leave the
+ # (default) internal IP list (127/8).
+ if (!$internal->contains_ip ($relay->{ip})) {
+ $in_internal = 0;
+ }
}
# note: you can't be in internal networks, but not be in a trusted