From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 17 Feb 2015 07:46:40 +0000 (+0200)
Subject: Unbreak operation of rbl.lua in certain instances
X-Git-Tag: 0.8.2~40^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e43f9993630049942f6f12b044ed6c86ff6b8004;p=thirdparty%2Frspamd.git

Unbreak operation of rbl.lua in certain instances
---

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index 82955f13c4..198e725f44 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -36,10 +36,7 @@ local private_ips = nil
 local rspamd_logger = require "rspamd_logger"
 local rspamd_ip = require "rspamd_ip"
 
-local function validate_dns(lstr, rstr)
-  if (lstr:len() + rstr:len()) > 252 then
-    return false
-  end
+local function validate_dns(lstr)
   for v in lstr:gmatch("[^%.]+") do
     if not v:match("^[%w-]+$") or v:len() > 63
       or v:match("^-") or v:match("-$") then
@@ -144,7 +141,7 @@ local function rbl_cb (task)
 	  if not havegot['helo'] then
 	    havegot['helo'] = task:get_helo()
 	    if havegot['helo'] == nil or
-              not validate_dns(havegot['helo'], rbl['rbl']) then
+              not validate_dns(havegot['helo']) then
 	      notgot['helo'] = true
 	      return
 	    end