diff options
author | Andrew Lewis <nerf@judo.za.org> | 2015-02-12 17:11:58 +0200 |
---|---|---|
committer | Andrew Lewis <nerf@judo.za.org> | 2015-02-12 17:12:50 +0200 |
commit | c2a4fda0e3e7916a5495322d551b733c0e2d171e (patch) | |
tree | 04c8042a0916a105507e0a891716fee6d47c6a77 /src/plugins | |
parent | 904ceb7a3022fa8a266be14a807b76b86673b4e0 (diff) | |
download | rspamd-c2a4fda0e3e7916a5495322d551b733c0e2d171e.tar.gz rspamd-c2a4fda0e3e7916a5495322d551b733c0e2d171e.zip |
Rename user to exclude_users and invert logic
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/lua/rbl.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua index 9aa0d15cf..f89055f26 100644 --- a/src/plugins/lua/rbl.lua +++ b/src/plugins/lua/rbl.lua @@ -63,7 +63,7 @@ local function rbl_cb (task) for k,rbl in pairs(rbls) do (function() - if rbl['user'] == false then + if rbl['exclude_users'] then if not havegot['user'] and not notgot['user'] then havegot['user'] = task:get_user() if havegot['user'] == nil then @@ -167,7 +167,7 @@ if type(rspamd_config.get_api_version) ~= 'nil' then rspamd_config:register_module_option('rbl', 'default_rdns', 'string') rspamd_config:register_module_option('rbl', 'default_helo', 'string') rspamd_config:register_module_option('rbl', 'default_unknown', 'string') - rspamd_config:register_module_option('rbl', 'default_user', 'string') + rspamd_config:register_module_option('rbl', 'default_exclude_users', 'string') end end @@ -197,11 +197,11 @@ end if(opts['default_helo'] == nil) then opts['default_helo'] = false end -if(opts['default_user'] == nil) then - opts['default_user'] = true +if(opts['default_exclude_users'] == nil) then + opts['default_exclude_users'] = false end for key,rbl in pairs(opts['rbls']) do - local o = { "ipv4", "ipv6", "from", "received", "unknown", "rdns", "helo", "user" } + local o = { "ipv4", "ipv6", "from", "received", "unknown", "rdns", "helo", "exclude_users" } for i=1,table.maxn(o) do if(rbl[o[i]] == nil) then rbl[o[i]] = opts['default_' .. o[i]] |