diff options
author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2011-05-13 20:02:17 +0400 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2011-05-13 20:02:17 +0400 |
commit | c594689abf8dad487c16615d451f11021ac8de68 (patch) | |
tree | ff844a81a3b9fe8d0bb3be7d5bcb7f68dc76ee8a /src/settings.c | |
parent | 610afb87562429d72c2fce6c3c294afaf001b85c (diff) | |
download | rspamd-c594689abf8dad487c16615d451f11021ac8de68.tar.gz rspamd-c594689abf8dad487c16615d451f11021ac8de68.zip |
Add more options to rspamc client.
Remove unused scores.
Diffstat (limited to 'src/settings.c')
-rw-r--r-- | src/settings.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/settings.c b/src/settings.c index 6dd6cd3b0..1d0853f0a 100644 --- a/src/settings.c +++ b/src/settings.c @@ -438,22 +438,11 @@ check_metric_settings (struct worker_task * task, struct metric * metric, double { struct rspamd_settings *us = NULL, *ds = NULL; double *sc, *rs; - gboolean black; *rscore = DEFAULT_REJECT_SCORE; if (check_setting (task, &us, &ds)) { if (us != NULL) { - /* First look in user white list */ - if (check_bwhitelist(task, us, &black)) { - if (black) { - *score = -DEFAULT_REJECT_SCORE; - } - else { - *score = DEFAULT_REJECT_SCORE; - } - return TRUE; - } if ((rs = g_hash_table_lookup (us->reject_scores, metric->name)) != NULL) { *rscore = *rs; } @@ -471,15 +460,6 @@ check_metric_settings (struct worker_task * task, struct metric * metric, double } } else if (ds != NULL) { - if (check_bwhitelist(task, ds, &black)) { - if (black) { - *score = DEFAULT_REJECT_SCORE; - } - else { - *score = 0; - } - return TRUE; - } if ((rs = g_hash_table_lookup (ds->reject_scores, metric->name)) != NULL) { *rscore = *rs; } |