[Minor] Remove unused options

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 7e306fe5c163bc0a1faaa4d82a2bb25286db3c2c..fa04564f856452ad9b3858b2bf4c5bcf8784cef8 100644 (file)
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -301,16 +301,12 @@ struct rspamd_config {
        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 convert_config;                        /**< convert config to XML format                                               */
-       gboolean strict_protocol_headers;               /**< strictly check protocol headers                                    */
        gboolean check_all_filters;                     /**< check all filters                                                                  */
        gboolean allow_raw_input;                       /**< scan messages with invalid mime                                    */
        gboolean disable_hyperscan;                     /**< disable hyperscan usage                                                    */
        gboolean vectorized_hyperscan;                  /**< use vectorized hyperscan matching                                  */
        gboolean enable_shutdown_workaround;            /**< enable workaround for legacy SA clients (exim)             */
        gboolean ignore_received;                       /**< Ignore data from the first received header                 */
-       gboolean check_local;                           /** Don't disable any checks for local networks */
-       gboolean check_authed;                          /** Don't disable any checks for authenticated users */
        gboolean enable_sessions_cache;                 /**< Enable session cache for debug */
 
        gsize max_diff;                                 /**< maximum diff size for text parts                                   */
@@ -338,17 +334,8 @@ struct rspamd_config {
        guint log_error_elt_maxlen;                     /**< maximum size of error log element                                  */
        struct rspamd_worker_log_pipe *log_pipes;
 
-       gboolean mlock_statfile_pool;                   /**< use mlock (2) for locking statfiles                                */
        gboolean compat_messages;                       /**< use old messages in the protocol (array)                   */
 
-       gboolean delivery_enable;                       /**< is delivery agent is enabled                                               */
-       gchar *deliver_host;                            /**< host for mail deliviring                                                   */
-       struct in_addr deliver_addr;                    /**< its address                                                                                */
-       guint16 deliver_port;                           /**< port for deliviring                                                                */
-       guint16 deliver_family;                         /**< socket family for delivirnig                                               */
-       gchar *deliver_agent_path;                      /**< deliver to pipe instead of socket                                  */
-       gboolean deliver_lmtp;                          /**< use LMTP instead of SMTP                                                   */
-
        GList *script_modules;                          /**< linked list of script modules to load                              */
        GHashTable *explicit_modules;                   /**< modules that should be always loaded                               */
 

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 97148d22bcd477035214c013762b54ae69883194..dbc0fc5a411bc4b8e7cca47bdf511cda28685ee4 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1999,30 +1999,6 @@ rspamd_rcl_config_init (struct rspamd_config *cfg)
                        G_STRUCT_OFFSET (struct rspamd_config, history_file),
                        RSPAMD_CL_FLAG_STRING_PATH,
                        "Path to history file");
-       rspamd_rcl_add_default_handler (sub,
-                       "use_mlock",
-                       rspamd_rcl_parse_struct_boolean,
-                       G_STRUCT_OFFSET (struct rspamd_config, mlock_statfile_pool),
-                       0,
-                       "Use mlock call for statistics to ensure that all files are in RAM");
-       rspamd_rcl_add_default_handler (sub,
-                       "strict_protocol_headers",
-                       rspamd_rcl_parse_struct_boolean,
-                       G_STRUCT_OFFSET (struct rspamd_config, strict_protocol_headers),
-                       0,
-                       "Emit errors if there are unknown HTTP headers in a request");
-       rspamd_rcl_add_default_handler (sub,
-                       "check_local",
-                       rspamd_rcl_parse_struct_boolean,
-                       G_STRUCT_OFFSET (struct rspamd_config, check_local),
-                       0,
-                       "Don't disable any checks for local networks");
-       rspamd_rcl_add_default_handler (sub,
-                       "check_authed",
-                       rspamd_rcl_parse_struct_boolean,
-                       G_STRUCT_OFFSET (struct rspamd_config, check_authed),
-                       0,
-                       "Don't disable any checks for authenticated users");
        rspamd_rcl_add_default_handler (sub,
                        "check_all_filters",
                        rspamd_rcl_parse_struct_boolean,