Remove hard dependency on settings.

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index 9932b814d1a05aa729a87e344c8e162ccfef50bc..5c35946653ebd52b317d73f33655c1a6f638ed91 100644 (file)
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -30,7 +30,6 @@
 #include "cfg_file.h"
 #include "util.h"
 #include "expressions.h"
-#include "settings.h"
 #include "binlog.h"
 #include "diff.h"
 #include "classifiers/classifiers.h"
@@ -80,8 +79,6 @@ insert_metric_result (struct rspamd_task *task, struct metric *metric, const gch
                metric_res->metric = metric;
                metric_res->grow_factor = 0;
                metric_res->score = 0;
-               metric_res->domain_settings = NULL;
-               metric_res->user_settings = NULL;
                apply_metric_settings (task, metric, metric_res);
                g_hash_table_insert (task->results, (gpointer) metric->name, metric_res);
        }

diff --git a/src/libmime/filter.h b/src/libmime/filter.h
index 7c3f3e51edc1736f7448eb95170613ac00f1c26c..2891ebd00ace102aeaa932577a5629cea377aefa 100644 (file)
--- a/src/libmime/filter.h
+++ b/src/libmime/filter.h
@@ -65,8 +65,6 @@ struct metric_result {
        GHashTable *symbols;                                                    /**< symbols of metric                                          */
        gboolean checked;                                                               /**< whether metric result is consolidated  */
        double grow_factor;                                                             /**< current grow factor                                        */
-       struct rspamd_settings *user_settings;                  /**< settings for metric                                        */
-       struct rspamd_settings *domain_settings;                /**< settings for metric                                        */
 };
 
 /**

diff --git a/src/libmime/smtp_utils.c b/src/libmime/smtp_utils.c
index 5d8f94f64075769d4a006438b024d082c253208b..28d4b6cf352b44d87b03041423be67b5077720da 100644 (file)
--- a/src/libmime/smtp_utils.c
+++ b/src/libmime/smtp_utils.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #include "main.h"
 #include "filter.h"
-#include "settings.h"
 #include "smtp.h"
 #include "smtp_proto.h"
 

diff --git a/src/libserver/CMakeLists.txt b/src/libserver/CMakeLists.txt
index b46a88ffdb4b282d4b4c1d5563e7427d38b915f6..290e4c301a766ca70b9209ada79a02dcead4602e 100644 (file)
--- a/src/libserver/CMakeLists.txt
+++ b/src/libserver/CMakeLists.txt
@@ -12,7 +12,6 @@ SET(LIBRSPAMDSERVERSRC
                                protocol.c
                                proxy.c
                                roll_history.c
-                               settings.c
                                spf.c
                                statfile.c
                                statfile_sync.c

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index be9f635937645113143ad46416be419f08ab2e8b..6347e3869494283fe935affd60100c2eab22d25e 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -23,7 +23,6 @@
 
 #include "cfg_rcl.h"
 #include "main.h"
-#include "settings.h"
 #include "cfg_file.h"
 #include "lua/lua_common.h"
 #include "expressions.h"

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index d041faa50c0b481bad8922b8b8654b75649d7d95..71821244ac90a8f6fca0ecd4dd93e28395f6ac44 100644 (file)
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -28,7 +28,6 @@
 #include "cfg_file.h"
 #include "main.h"
 #include "filter.h"
-#include "settings.h"
 #include "classifiers/classifiers.h"
 #include "lua/lua_common.h"
 #include "kvstorage_config.h"

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 6f22b5f34bb71e83c91abc86986faf49a874f357..fc4096f8c9de9a4fb0a35ef519a71c03c765adf6 100644 (file)
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -26,7 +26,6 @@
 #include "main.h"
 #include "util.h"
 #include "cfg_file.h"
-#include "settings.h"
 #include "message.h"
 
 /* Max line size */

diff --git a/src/libserver/task.c b/src/libserver/task.c
index d19362fca5c8fb21c50690cbd93e1275c0b542ff..a46a706042bcf0e2996336a790f37265ee699021 100644 (file)
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -249,6 +249,9 @@ rspamd_task_free (struct rspamd_task *task, gboolean is_soft)
                if (task->sock != -1) {
                        close (task->sock);
                }
+               if (task->settings != NULL) {
+                       ucl_object_unref (task->settings);
+               }
                rspamd_mempool_delete (task->task_pool);
                g_slice_free1 (sizeof (struct rspamd_task), task);
        }

diff --git a/src/libserver/task.h b/src/libserver/task.h
index 1d2b299ec2c6416a47df4a7973606ce4df7c7b0c..4c3462d9a26379fee7ef0ed91c7ac91e4def0ad8 100644 (file)
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -138,6 +138,8 @@ struct rspamd_task {
                enum rspamd_metric_action action;                                               /**< Action of pre filters                                                      */
                gchar *str;                                                                                             /**< String describing action                                           */
        } pre_result;                                                                                           /**< Result of pre-filters                                                      */
+
+       ucl_object_t *settings;                                                                         /**< Settings applied to task                                           */
 };
 
 /**

diff --git a/src/smtp_proxy.c b/src/smtp_proxy.c
index f5f7856a1cd4936d84cc11bfee156ba36ed6c05f..c2df491b6be91e21fb80f918248b26304a16faf8 100644 (file)
--- a/src/smtp_proxy.c
+++ b/src/smtp_proxy.c
@@ -28,7 +28,6 @@
 #include "smtp_proto.h"
 #include "map.h"
 #include "message.h"
-#include "settings.h"
 #include "dns.h"
 #include "upstream.h"
 #include "proxy.h"