From e95b2fa66a8d130c9f7260cf71178df5762f7746 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 20 Oct 2020 14:43:03 +0100
Subject: [PATCH] [Minor] Provide some upgrade path

---
 lualib/plugins/rbl.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lualib/plugins/rbl.lua b/lualib/plugins/rbl.lua
index 12c795e00..7105d73a4 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
 
-- 
2.39.5