From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 4 Oct 2013 14:17:27 +0000 (+0100)
Subject: Fix other stuff to work with rcl modules.
X-Git-Tag: 0.6.0~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=842d2c4164dad1d8539eb2ecf114f9220b23970d;p=thirdparty%2Frspamd.git

Fix other stuff to work with rcl modules.
---

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index af36b512cc..561058e1ad 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -76,6 +76,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 TARGET_LINK_LIBRARIES(rspamd-util ${CMAKE_REQUIRED_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamd-util pcre)
+TARGET_LINK_LIBRARIES(rspamd-util rspamd-rcl)
 TARGET_LINK_LIBRARIES(rspamd-util ${GLIB2_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamd-util event)
 
diff --git a/src/main.c b/src/main.c
index 4b78b41733..8f37f5cc9b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1161,9 +1161,6 @@ main (gint argc, gchar **argv, gchar **env)
 		if (! init_lua_filters (rspamd_main->cfg)) {
 			res = FALSE;
 		}
-		if (!check_modules_config (rspamd_main->cfg)) {
-			res = FALSE;
-		}
 		/* Perform modules configuring */
 		l = g_list_first (rspamd_main->cfg->filters);
 
@@ -1240,8 +1237,6 @@ main (gint argc, gchar **argv, gchar **env)
 		exit (EXIT_FAILURE);
 	}
 
-	/* Check configuration for modules */
-	(void)check_modules_config (rspamd_main->cfg);
 
 	/* Insert classifiers symbols */
 	(void)insert_classifier_symbols (rspamd_main->cfg);
diff --git a/src/plugins/surbl.h b/src/plugins/surbl.h
index 5d8cf30396..27eaa75dd4 100644
--- a/src/plugins/surbl.h
+++ b/src/plugins/surbl.h
@@ -36,7 +36,7 @@ struct surbl_ctx {
 	gchar *metric;
 	const gchar *tld2_file;
 	const gchar *whitelist_file;
-	gchar *redirector_symbol;
+	const gchar *redirector_symbol;
 	GHashTable **exceptions;
 	GHashTable *whitelist;
 	GHashTable *redirector_hosts;