From: Vsevolod Stakhov Date: Tue, 5 Dec 2017 18:26:17 +0000 (+0000) Subject: [Minor] Do not crash if no actions defined X-Git-Tag: 1.7.0~371 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48ffe66c9aa764a691c416edb0f52a514397166b;p=thirdparty%2Frspamd.git [Minor] Do not crash if no actions defined --- diff --git a/lualib/rspamd_config_transform.lua b/lualib/rspamd_config_transform.lua index a46ede336c..e74c0f689c 100644 --- a/lualib/rspamd_config_transform.lua +++ b/lualib/rspamd_config_transform.lua @@ -256,21 +256,21 @@ return function(cfg) if not cfg.actions then logger.errx('no actions defined') - end - - -- Perform sanity check for actions - local actions_defs = {'greylist', 'add header', 'add_header', - 'rewrite subject', 'rewrite_subject', 'reject'} - - if not cfg.actions['no action'] and not cfg.actions['no_action'] and - not cfg.actions['accept'] then - for _,d in ipairs(actions_defs) do - if cfg.actions[d] then - if cfg.actions[d] < 0 then - cfg.actions['no action'] = cfg.actions[d] - 0.001 - logger.infox('set no action score to: %s, as action %s has negative score', + else + -- Perform sanity check for actions + local actions_defs = {'greylist', 'add header', 'add_header', + 'rewrite subject', 'rewrite_subject', 'reject'} + + if not cfg.actions['no action'] and not cfg.actions['no_action'] and + not cfg.actions['accept'] then + for _,d in ipairs(actions_defs) do + if cfg.actions[d] then + if cfg.actions[d] < 0 then + cfg.actions['no action'] = cfg.actions[d] - 0.001 + logger.infox('set no action score to: %s, as action %s has negative score', cfg.actions['no action'], d) - break + break + end end end end