From: Andrew Lewis <nerf@judo.za.org>
Date: Thu, 12 Feb 2015 13:01:04 +0000 (+0200)
Subject: rbl.lua: Don't ask for user unless called for by config
X-Git-Tag: 0.9.0~723^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=904ceb7a3022fa8a266be14a807b76b86673b4e0;p=rspamd.git

rbl.lua: Don't ask for user unless called for by config
---

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index b235b13a1..9aa0d15cf 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -63,14 +63,16 @@ local function rbl_cb (task)
   for k,rbl in pairs(rbls) do
 
     (function()
-      if not notgot['user'] and not havegot['user'] then
-	havegot['user'] = task:get_user()
-	if havegot['user'] == nil then
-	  notgot['user'] = true
-	end
-      end
-      if havegot['user'] ~= nil and rbl['user'] == false then
-	return
+      if rbl['user'] == false then
+        if not havegot['user'] and not notgot['user'] then
+	  havegot['user'] = task:get_user()
+	  if havegot['user'] == nil then
+	    notgot['user'] = true
+	  end
+        end
+        if havegot['user'] ~= nil then
+	  return
+        end
       end
 
       if rbl['helo'] then