diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2023-11-03 17:40:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 17:40:12 +0000 |
| commit | f5d5be99421097d18824c69148b7dacb608e7b84 (patch) | |
| tree | 402d2277c3428f52976d508ab843483fee6d8f56 /src/plugins | |
| parent | f268919adfe3f43814413062078bea000bc0ff02 (diff) | |
| parent | eeabb14d927ebbf5aa92da60f55651e0bd143276 (diff) | |
| download | rspamd-f5d5be99421097d18824c69148b7dacb608e7b84.tar.gz rspamd-f5d5be99421097d18824c69148b7dacb608e7b84.zip | |
Merge pull request #4678 from fatalbanana/rbl_exclude_local
[Fix] rbl: unbreak `exclude_local`
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/lua/rbl.lua | 6 |
1 files changed, 2 insertions, 4 deletions
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 |