diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-07-27 19:23:22 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-07-27 19:23:22 +0400 |
| commit | 0928c484b2052d4ea1a6bcb7573301fbf7f94f72 (patch) | |
| tree | 1b91615255421ffa754159c20cd13d3c65bfb63d | |
| parent | be555f381e6b72d76c72a91b78291217e6a77c0b (diff) | |
| download | rspamd-0928c484b2052d4ea1a6bcb7573301fbf7f94f72.tar.gz rspamd-0928c484b2052d4ea1a6bcb7573301fbf7f94f72.zip | |
* Fix some multimap issues
| -rw-r--r-- | src/plugins/lua/multimap.lua | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua index ebf419b12..18d5c503e 100644 --- a/src/plugins/lua/multimap.lua +++ b/src/plugins/lua/multimap.lua @@ -62,7 +62,7 @@ function add_rule(params) type = 'ip', header = nil, pattern = nil, - file = nil, + map = nil, symbol = nil } for _,param in ipairs(params) do @@ -84,8 +84,8 @@ function add_rule(params) newrule['header'] = value elseif name == 'pattern' then newrule['pattern'] = value - elseif name == 'file' then - newrule['file'] = value + elseif name == 'map' then + newrule['map'] = value elseif name == 'symbol' then newrule['symbol'] = value else @@ -94,14 +94,14 @@ function add_rule(params) end end - if not newrule['symbol'] or not newrule['file'] or not newrule['symbol'] then + if not newrule['symbol'] or not newrule['map'] or not newrule['symbol'] then rspamd_logger:err('incomplete rule') return 0 end if newrule['type'] == 'ip' then - newrule['ips'] = rspamd_config:add_radix_map (newrule['file']) + newrule['ips'] = rspamd_config:add_radix_map (newrule['map']) else - newrule['hash'] = rspamd_config:add_hash_map (newrule['file']) + newrule['hash'] = rspamd_config:add_hash_map (newrule['map']) end table.insert(rules, newrule) return 1 @@ -109,8 +109,9 @@ end local opts = rspamd_config:get_all_opt('multimap') if opts then - for opt,value in pairs(opts) do - if opt == 'rule' then + local strrules = opts['rule'] + if strrules then + for _,value in ipairs(strrules) do local params = split(value, ',') if not add_rule (params) then rspamd_logger:err('cannot add rule: "'..value..'"') |