From: Jose Celestino <japc@co.sapo.pt>
Date: Tue, 14 Jan 2025 13:52:46 +0000 (+0000)
Subject: [Minor] Don't skip resolve_ip when ignore_defaults is true and ipv4 and ipv6 aren... 
X-Git-Tag: 3.11.1~40^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5292%2Fhead;p=thirdparty%2Frspamd.git

[Minor] Don't skip resolve_ip when ignore_defaults is true and ipv4 and ipv6 aren't set
---

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index 2326821102..2c2fe0071e 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -983,7 +983,7 @@ local function gen_rbl_callback(rule)
         if req.resolve_ip then
           -- Deal with both ipv4 and ipv6
           -- Resolve names first
-          if rule.ipv4 and r:resolve_a({
+          if (rule.ipv4 == nil or rule.ipv4) and r:resolve_a({
             task = task,
             name = req.n,
             callback = gen_rbl_ip_dns_callback(req),
@@ -991,7 +991,7 @@ local function gen_rbl_callback(rule)
           }) then
             nresolved = nresolved + 1
           end
-          if rule.ipv6 and r:resolve('aaaa', {
+          if (rule.ipv6 == nil or rule.ipv6) and r:resolve('aaaa', {
             task = task,
             name = req.n,
             callback = gen_rbl_ip_dns_callback(req),