From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 10 Sep 2021 15:53:19 +0000 (+0100)
Subject: [Minor] Remove unused cfg fields
X-Git-Tag: 3.1~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6729b60066a4dcf9a38e3e766d829b9932ec5d29;p=thirdparty%2Frspamd.git

[Minor] Remove unused cfg fields
---

diff --git a/conf/options.inc b/conf/options.inc
index f305bcfcbf..d5cf60d7b5 100644
--- a/conf/options.inc
+++ b/conf/options.inc
@@ -14,7 +14,6 @@
 # Relevant documentation: https://rspamd.com/doc/configuration/options.html
 
 filters = "chartable,dkim,regexp,fuzzy_check";
-raw_mode = false;
 one_shot = false;
 cache_file = "$DBDIR/symbols.cache";
 # How often maps are checked (
diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 745f0fb220..2aad328f70 100644
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -363,7 +363,6 @@ struct rspamd_config {
 	GHashTable *groups;                            /**< groups of symbols								*/
 	struct rspamd_action *actions;                  /**< all actions of the metric						*/
 
-	gboolean raw_mode;                              /**< work in raw mode instead of utf one				*/
 	gboolean one_shot_mode;                         /**< rules add only one symbol							*/
 	gboolean check_text_attachements;               /**< check text attachements as text					*/
 	gboolean check_all_filters;                     /**< check all filters									*/
@@ -480,7 +479,6 @@ struct rspamd_config {
 	guint max_blas_threads;                         /**< maximum threads for openblas when learning ANN		*/
 	guint max_opts_len;                             /**< maximum length for all options for a symbol		*/
 
-	GList *classify_headers;                        /**< list of headers using for statistics				*/
 	struct module_s **compiled_modules;                /**< list of compiled C modules							*/
 	struct worker_s **compiled_workers;                /**< list of compiled C modules							*/
 	struct rspamd_log_format *log_format;            /**< parsed log format									*/
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index e3c69c3431..06b7edee21 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1759,12 +1759,6 @@ rspamd_rcl_config_init (struct rspamd_config *cfg, GHashTable *skip_sections)
 				G_STRUCT_OFFSET (struct rspamd_config, dns_max_requests),
 				RSPAMD_CL_FLAG_INT_32,
 				"Maximum DNS requests per task (default: 64)");
-		rspamd_rcl_add_default_handler (sub,
-				"classify_headers",
-				rspamd_rcl_parse_struct_string_list,
-				G_STRUCT_OFFSET (struct rspamd_config, classify_headers),
-				0,
-				"List of headers used for classifiers");
 		rspamd_rcl_add_default_handler (sub,
 				"control_socket",
 				rspamd_rcl_parse_struct_string,
@@ -1783,12 +1777,6 @@ rspamd_rcl_config_init (struct rspamd_config *cfg, GHashTable *skip_sections)
 				G_STRUCT_OFFSET (struct rspamd_config, allow_raw_input),
 				0,
 				"Allow non MIME input for rspamd");
-		rspamd_rcl_add_default_handler (sub,
-				"raw_mode",
-				rspamd_rcl_parse_struct_boolean,
-				G_STRUCT_OFFSET (struct rspamd_config, raw_mode),
-				0,
-				"Don't try to convert all messages to utf8");
 		rspamd_rcl_add_default_handler (sub,
 				"one_shot",
 				rspamd_rcl_parse_struct_boolean,