Disable old settings API.

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index 21212e686e8423a70c4ca615f428f289b324510f..2068c79e3eff429f3e735d7d7f5de6127c775e2b 100644 (file)
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -90,7 +90,6 @@ insert_metric_result (struct rspamd_task *task, struct metric *metric, const gch
                w = (*weight) * flag;
        }
 
-
        /* Add metric score */
        if ((s = g_hash_table_lookup (metric_res->symbols, symbol)) != NULL) {
                if (s->options && opts && opts != s->options) {

diff --git a/src/libmime/smtp_utils.c b/src/libmime/smtp_utils.c
index 28d4b6cf352b44d87b03041423be67b5077720da..8ed169fa71fe7f7ac7175036e6bdbc93cf1463f4 100644 (file)
--- a/src/libmime/smtp_utils.c
+++ b/src/libmime/smtp_utils.c
@@ -144,6 +144,10 @@ smtp_metric_callback (gpointer key, gpointer value, gpointer ud)
 
        task = cd->session->task;
 
+       /* XXX rewrite */
+       ms = metric_res->metric->actions[METRIC_ACTION_REJECT].score;
+       rs = metric_res->metric->actions[METRIC_ACTION_REJECT].score;
+#if 0
        if (!check_metric_settings (metric_res, &ms, &rs)) {
                ms = metric_res->metric->actions[METRIC_ACTION_REJECT].score;
                rs = metric_res->metric->actions[METRIC_ACTION_REJECT].score;
@@ -151,6 +155,7 @@ smtp_metric_callback (gpointer key, gpointer value, gpointer ud)
        if (! check_metric_action_settings (task, metric_res, metric_res->score, &action)) {
                action = check_metric_action (metric_res->score, ms, metric_res->metric);
        }
+#endif
        if (metric_res->score >= ms) {
                is_spam = 1;
        }

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 71821244ac90a8f6fca0ecd4dd93e28395f6ac44..e1652ac55f0c0f503479bfd9d7c58066cb47106a 100644 (file)
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -296,9 +296,6 @@ rspamd_config_defaults (struct rspamd_config *cfg)
 
        cfg->log_level = G_LOG_LEVEL_WARNING;
        cfg->log_extended = TRUE;
-
-       init_settings (cfg);
-
 }
 
 void