]> source.dussan.org Git - rspamd.git/commitdiff
Amendment for rbl.lua update 146/head
authorAndrew Lewis <nerf@judo.za.org>
Wed, 11 Feb 2015 14:14:43 +0000 (16:14 +0200)
committerAndrew Lewis <nerf@judo.za.org>
Wed, 11 Feb 2015 14:15:12 +0000 (16:15 +0200)
src/plugins/lua/rbl.lua

index 9258c1e8636cd47d9a6a46333d9dae7a301ef50e..a5d67d4144b542dd7021daae6080501d9c85860b 100644 (file)
@@ -60,7 +60,10 @@ local function rbl_cb (task)
   local havegot = {}
   local notgot = {}
   local function check_user() 
-    if not havegot['user'] and not notgot['user'] then
+    if notgot['user'] then
+      return false
+    end
+    if not havegot['user'] then
       havegot['user'] = task:get_user()
       if havegot['user'] == nil then
         notgot['user'] = true
@@ -153,7 +156,7 @@ local function rbl_cb (task)
           return
         end
         for _,rh in ipairs(havegot['received']) do
-          if rh['real_ip'] and rh['real_ip']:to_string() ~= '0.0.0.0' then
+          if rh['real_ip'] and rh['real_ip']:is_valid() then
             for k,rbl in pairs(rbls) do
               if (rh['real_ip']:get_version() == 6 and rbl['ipv6']) or
                 (rh['real_ip']:get_version() == 4 and rbl['ipv4']) then