diff options
| -rw-r--r-- | lualib/plugins/rbl.lua | 2 | ||||
| -rw-r--r-- | src/plugins/lua/rbl.lua | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lualib/plugins/rbl.lua b/lualib/plugins/rbl.lua index 320fd7725..bf8bd3cfa 100644 --- a/lualib/plugins/rbl.lua +++ b/lualib/plugins/rbl.lua @@ -49,7 +49,6 @@ local default_options = { ['default_unknown'] = false, ['default_dkim_domainonly'] = true, ['default_emails_domainonly'] = false, - ['default_exclude_private_ips'] = true, ['default_exclude_users'] = false, ['default_exclude_local'] = true, ['default_no_ip'] = false, @@ -91,7 +90,6 @@ local rule_schema_tbl = { emails_domainonly = ts.boolean:is_optional(), enabled = ts.boolean:is_optional(), exclude_local = ts.boolean:is_optional(), - exclude_private_ips = ts.boolean:is_optional(), exclude_users = ts.boolean:is_optional(), from = ts.boolean:is_optional(), hash = ts.one_of { "sha1", "sha256", "sha384", "sha512", "md5", "blake2" }:is_optional(), diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua index f2233a3e5..fda7cce16 100644 --- a/src/plugins/lua/rbl.lua +++ b/src/plugins/lua/rbl.lua @@ -151,9 +151,7 @@ local function gen_check_rcvd_conditions(rbl, received_total) end if ((rh.real_ip:get_version() == 6 and rbl.ipv6) or (rh.real_ip:get_version() == 4 and rbl.ipv4)) and - ((rbl.exclude_private_ips and not rh.real_ip:is_local()) or - not rbl.exclude_private_ips) and ((rbl.exclude_local_ips and - not is_excluded_ip(rh.real_ip)) or not rbl.exclude_local_ips) then + ((rbl.exclude_local and not rh.real_ip:is_local() or is_excluded_ip(rh.real_ip)) or not rbl.exclude_local) then return true else return false @@ -845,7 +843,7 @@ local function gen_rbl_callback(rule) description[#description + 1] = 'user' end - if rule.exclude_local or rule.exclude_private_ips then + if rule.exclude_local then pipeline[#pipeline + 1] = check_local description[#description + 1] = 'local' end |