From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 20 Oct 2020 13:43:03 +0000 (+0100)
Subject: [Minor] Provide some upgrade path
X-Git-Tag: 2.7~216
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e95b2fa66a8d130c9f7260cf71178df5762f7746;p=thirdparty%2Frspamd.git

[Minor] Provide some upgrade path
---

diff --git a/lualib/plugins/rbl.lua b/lualib/plugins/rbl.lua
index 12c795e009..7105d73a4b 100644
--- a/lualib/plugins/rbl.lua
+++ b/lualib/plugins/rbl.lua
@@ -158,6 +158,22 @@ local function convert_checks(rule)
     rule.connfilter = all_connfilter
   end
 
+  -- Now check if we have any check enabled at all
+  local check_found = false
+  for k,_ in pairs(check_types) do
+    if type(rule[k]) ~= 'nil' then
+      check_found = true
+      break
+    end
+  end
+
+  if not check_found then
+    -- Enable implicit `from` check to allow upgrade
+    rspamd_logger.warnx(rspamd_config, 'rbl rule %s has no check enabled, enable default `from` check',
+        rule.symbol)
+    rule.from = true
+  end
+
   return rule
 end