diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-08-25 18:14:36 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-08-25 18:14:36 +0100 |
| commit | 09e125bdc94c80b0582155d45b055fa84627e20d (patch) | |
| tree | fac0db24c254d50fa46cac819bd07e005c01e03e /src/libserver | |
| parent | 2edb82c0e02cab3f2111ac5a8d792c2eeeb18642 (diff) | |
| download | rspamd-09e125bdc94c80b0582155d45b055fa84627e20d.tar.gz rspamd-09e125bdc94c80b0582155d45b055fa84627e20d.zip | |
Fix settings for actions other than reject
Diffstat (limited to 'src/libserver')
| -rw-r--r-- | src/libserver/cfg_utils.c | 1 | ||||
| -rw-r--r-- | src/libserver/protocol.c | 10 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c index ecdd28a91..7246ab4a1 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -552,6 +552,7 @@ rspamd_config_new_metric (struct rspamd_config *cfg, struct metric *c, for (i = METRIC_ACTION_REJECT; i < METRIC_ACTION_MAX; i++) { c->actions[i].score = -1.0; + c->actions[i].action = i; } c->subject = SPAM_SUBJECT; diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c index 162f75f40..3ee2def4d 100644 --- a/src/libserver/protocol.c +++ b/src/libserver/protocol.c @@ -866,15 +866,9 @@ rspamd_metric_result_ucl (struct rspamd_task *task, gchar action_char; m = mres->metric; + mres->action = rspamd_check_action_metric (task, mres->score, + &required_score, m); - /* XXX: handle settings */ - if (mres->action == METRIC_ACTION_MAX) { - mres->action = rspamd_check_action_metric (task, mres->score, - &required_score, m); - } - else { - required_score = mres->metric->actions[mres->action].score; - } action = mres->action; is_spam = (action == METRIC_ACTION_REJECT); |