diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-11-13 22:48:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-13 22:48:20 +0000 |
| commit | d7c9202c62b2af8a0ceca3e98a32ffe6e6e377fb (patch) | |
| tree | e19b106373714a6fae52ca86161c51b97d11955b /src/plugins | |
| parent | bf5df7c30be8377fb38397ca7a7f03d5830bcc0e (diff) | |
| parent | 7fd12bdbdea3274b6e1a292ca35748a73efd01f8 (diff) | |
| download | rspamd-d7c9202c62b2af8a0ceca3e98a32ffe6e6e377fb.tar.gz rspamd-d7c9202c62b2af8a0ceca3e98a32ffe6e6e377fb.zip | |
Merge pull request #1125 from moisseev/patch-2
[Minor] Further simplify conditionals
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/lua/greylist.lua | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua index 35c30b806..70ad2117d 100644 --- a/src/plugins/lua/greylist.lua +++ b/src/plugins/lua/greylist.lua @@ -275,11 +275,9 @@ local function greylist_set(task) end local action = task:get_metric_action('default') - if action == 'reject' then return end - if do_greylisting_required and do_greylisting_required ~= "1" then + if action == 'reject' or + not do_greylisting_required and action == 'no action' then return - else - if action == 'no action' then return end end local body_key = data_key(task) local meta_key = envelope_key(task) |