[Rework] Simplify lua path initialization

4 files changed, 6 insertions, 6 deletions

diff --git a/src/rspamadm/configdump.c b/src/rspamadm/configdump.c
index 720d6bf51..6f320dea1 100644
--- a/src/rspamadm/configdump.c
+++ b/src/rspamadm/configdump.c
@@ -284,9 +284,10 @@ rspamadm_configdump (gint argc, gchar **argv)
 	}
 	else {
 		/* Do post-load actions */
+		rspamd_lua_set_path (cfg->lua_state, cfg->rcl_obj, ucl_vars);
 		rspamd_lua_post_load_config (cfg);
 
-		if (!rspamd_init_filters (rspamd_main->cfg, FALSE, ucl_vars)) {
+		if (!rspamd_init_filters (rspamd_main->cfg, FALSE)) {
 			ret = FALSE;
 		}
 
diff --git a/src/rspamadm/confighelp.c b/src/rspamadm/confighelp.c
index f3da9422d..5f8e1cfcc 100644
--- a/src/rspamadm/confighelp.c
+++ b/src/rspamadm/confighelp.c
@@ -20,7 +20,6 @@
 #include "cfg_rcl.h"
 #include "rspamd.h"
 #include "lua/lua_common.h"
-#include "confighelp.lua.h"
 
 static gboolean json = FALSE;
 static gboolean compact = FALSE;
@@ -251,7 +250,8 @@ rspamadm_confighelp (gint argc, gchar **argv)
 	}
 
 	/* Init lua modules */
-	rspamd_init_lua_filters (cfg, TRUE, ucl_vars);
+	rspamd_lua_set_path (cfg->lua_state, cfg->rcl_obj, ucl_vars);
+	rspamd_init_lua_filters (cfg, TRUE);
 
 	if (argc > 1) {
 		for (i = 1; i < argc; i ++) {
diff --git a/src/rspamadm/configtest.c b/src/rspamadm/configtest.c
index 3a15b976b..59f466de2 100644
--- a/src/rspamadm/configtest.c
+++ b/src/rspamadm/configtest.c
@@ -146,7 +146,7 @@ rspamadm_configtest (gint argc, gchar **argv)
 		/* Do post-load actions */
 		rspamd_lua_post_load_config (cfg);
 
-		if (!rspamd_init_filters (rspamd_main->cfg, FALSE, ucl_vars)) {
+		if (!rspamd_init_filters (rspamd_main->cfg, FALSE)) {
 			ret = FALSE;
 		}
 
diff --git a/src/rspamadm/control.c b/src/rspamadm/control.c
index 98bcd81f4..62a7e26ae 100644
--- a/src/rspamadm/control.c
+++ b/src/rspamadm/control.c
@@ -24,7 +24,6 @@
 #include <event.h>
 #include "libutil/util.h"
 #include "lua/lua_common.h"
-#include "fuzzy_stat.lua.h"
 
 static gchar *control_path = RSPAMD_DBDIR "/rspamd.sock";
 static gboolean json = FALSE;
@@ -135,7 +134,7 @@ rspamd_control_finish_handler (struct rspamd_http_connection *conn,
 						cbdata->argc,
 						cbdata->argv,
 						obj,
-						rspamadm_script_fuzzy_stat);
+						"fuzzy_stat");
 
 				rspamd_fstring_free (out);
 				ucl_object_unref (obj);