Fix other stuff to work with rcl modules.

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index af36b512cc4be8dd58eeb4a59a896e7dac7b3b1d..561058e1ad8331d826b20b3dc20355f2282bb6ca 100644 (file)
--- 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 4b78b417334c353256b37d689c9ac791995f653d..8f37f5cc9b6ac77c751a1ae5d9325d7b11cffe5f 100644 (file)
--- 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 5d8cf303967ba90c7940177c853cfa871c26baac..27eaa75dd43fe0904d6a44c8c8229efaf3b9bb93 100644 (file)
--- 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;