Mailing List Archive

Author: jm
Date: Sat Feb 7 20:19:52 2004
New Revision: 6578

Modified:
incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm
Log:
fixed bug: bayes was picking up non-IP tokens as IPs

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm Sat Feb 7 20:19:52 2004
@@ -603,13 +603,13 @@
# (on both sides)
# also make a dup with the full IP, as fodder for
# bayes_dump_to_trusted_networks: "H*r:ip*aaa.bbb.ccc.ddd"
- $val =~ s{(\b|[^\d])(\d{1,3}\.)(\d{1,3}\.)(\d{1,3})(\.\d{1,3})(\b|[^\d])}{
+ $val =~ s{\b(\d{1,3}\.)(\d{1,3}\.)(\d{1,3})(\.\d{1,3})\b}{
if ($2 eq '10' || ($2 eq '192' && $3 eq '168')) {
- $1.$2.$3.$4.$5.$6.
- " ip*".$2.$3.$4.$5." ";
+ $1.$2.$3.$4.
+ " ip*".$1.$2.$3.$4." ";
} else {
- $1.$2.$3.$4.$6.
- " ip*".$2.$3.$4.$5." ";
+ $1.$2.$3.$4.
+ " ip*".$1.$2.$3.$4." ";
}
}gex;