From: Andrew Lewis <nerf@judo.za.org>
Date: Wed, 11 Feb 2015 21:15:25 +0000 (+0200)
Subject: Further amendments for changes to RBL module
X-Git-Tag: 0.8.2~51^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a9f65167b33daa861f208caec04d8983338769be;p=rspamd.git

Further amendments for changes to RBL module
---

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index a5d67d414..3db397556 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -124,7 +124,7 @@ local function rbl_cb (task)
         end
         if not havegot['from'] then
           havegot['from'] = task:get_from_ip()
-          if havegot['from'] == nil then
+          if not havegot['from']:is_valid() then
             notgot['from'] = true
             return
           end
@@ -147,7 +147,7 @@ local function rbl_cb (task)
         end
         if not havegot['received'] then
           havegot['received'] = task:get_received_headers()
-          if havegot['received'] == nil then
+          if next(havegot['received']) == nil then
             notgot['received'] = true
             return
           end