You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2018/10/16 18:42:05 UTC

svn commit: r1844041 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm

Author: hege
Date: Tue Oct 16 18:42:05 2018
New Revision: 1844041

URL: http://svn.apache.org/viewvc?rev=1844041&view=rev
Log:
Some IP handling unifying

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm?rev=1844041&r1=1844040&r2=1844041&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm Tue Oct 16 18:42:05 2018
@@ -360,9 +360,8 @@ sub _check_rbl_addresses {
 
   $pms->load_resolver();
 
-  if (($rbl_server !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) &&
-      (index($rbl_server, '.') >= 0) &&
-      ($rbl_server !~ /\.$/)) {
+  if ($rbl_server !~ /\.$/ &&
+      $rbl_server !~ /^$IP_ADDRESS$/o) {
     $rbl_server .= ".";
   }
   dbg("dns: _check_rbl_addresses RBL $rbl_server, set $set");