From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 22 Jul 2014 14:43:14 +0000 (+0100)
Subject: Remove settings from the configuration.
X-Git-Tag: 0.7.0~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b27d449084c2e9aa9c16f6a1273f21a45f5a4a64;p=thirdparty%2Frspamd.git

Remove settings from the configuration.
---

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 6347e38694..ae1eadfe34 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -156,28 +156,6 @@ static gboolean
 rspamd_rcl_options_handler (struct rspamd_config *cfg, const ucl_object_t *obj,
 		gpointer ud, struct rspamd_rcl_section *section, GError **err)
 {
-	const ucl_object_t *val;
-	const gchar *user_settings, *domain_settings;
-
-	/* Handle user and domain settings */
-	val = ucl_object_find_key (obj, "user_settings");
-	if (val != NULL && ucl_object_tostring_safe (val, &user_settings)) {
-		if (!read_settings (user_settings, "Users' settings", cfg, cfg->user_settings)) {
-			g_set_error (err, CFG_RCL_ERROR, EINVAL, "cannot read settings: %s", user_settings);
-			return FALSE;
-		}
-		cfg->user_settings_str = rspamd_mempool_strdup (cfg->cfg_pool, user_settings);
-	}
-
-	val = ucl_object_find_key (obj, "domain_settings");
-	if (val != NULL && ucl_object_tostring_safe (val, &domain_settings)) {
-		if (!read_settings (domain_settings, "Domains settings", cfg, cfg->domain_settings)) {
-			g_set_error (err, CFG_RCL_ERROR, EINVAL, "cannot read settings: %s", domain_settings);
-			return FALSE;
-		}
-		cfg->domain_settings_str = rspamd_mempool_strdup (cfg->cfg_pool, domain_settings);
-	}
-
 	return rspamd_rcl_section_parse_defaults (section, cfg, obj, cfg, err);
 }