From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 15 Jan 2022 12:57:50 +0000 (+0000)
Subject: [Minor] Improve logic to select a random monitored mode for RBLs
X-Git-Tag: 3.2~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9368887523031fcad0524cee98af04181a59f3c;p=thirdparty%2Frspamd.git

[Minor] Improve logic to select a random monitored mode for RBLs
---

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index e901e1a2ff..22305aa1f6 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -47,21 +47,26 @@ local known_selectors = {} -- map from selector string to selector id
 local url_flag_bits = rspamd_url.flags
 
 local function get_monitored(rbl)
+  local function is_random_monitored()
+    return (rbl.dkim
+        or rbl.urls
+        or rbl.emails
+        or rbl.no_ip
+        or rbl.rdns
+        or rbl.helo)
+  end
+
   local default_monitored = '1.0.0.127'
   local ret = {
     rcode = 'nxdomain',
     prefix = default_monitored,
-    random = false,
+    random = is_random_monitored(),
   }
 
   if rbl.monitored_address then
     ret.prefix = rbl.monitored_address
   end
 
-  if rbl.dkim or rbl.urls or rbl.emails then
-    ret.random = true
-  end
-
   lua_util.debugm(N, rspamd_config,
       'added monitored address: %s (%s random)',
       ret.prefix, ret.random)