From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 4 Nov 2017 12:48:56 +0000 (+0000)
Subject: [Minor] Use pure UCL object when setting lua paths
X-Git-Tag: 1.7.0~484
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=366b697603f8178eed4d2386973e9392bbed6cdf;p=thirdparty%2Frspamd.git

[Minor] Use pure UCL object when setting lua paths
---

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 5f9d56a209..d32fa19192 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -900,7 +900,7 @@ rspamd_rcl_set_lua_globals (struct rspamd_config *cfg, lua_State *L,
 	/* Clear stack from globals */
 	lua_pop (L, 4);
 
-	rspamd_lua_set_path (L, cfg, vars);
+	rspamd_lua_set_path (L, cfg->rcl_obj, vars);
 
 	/* Set known paths as rspamd_paths global */
 	lua_getglobal (L, "rspamd_paths");
diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
index 3272ee2548..dcdfef8230 100644
--- a/src/lua/lua_common.c
+++ b/src/lua/lua_common.c
@@ -210,7 +210,7 @@ lua_add_actions_global (lua_State *L)
 }
 
 void
-rspamd_lua_set_path (lua_State *L, struct rspamd_config *cfg, GHashTable *vars)
+rspamd_lua_set_path (lua_State *L, const ucl_object_t *cfg_obj, GHashTable *vars)
 {
 	const gchar *old_path, *additional_path = NULL;
 	const ucl_object_t *opts;
@@ -232,8 +232,8 @@ rspamd_lua_set_path (lua_State *L, struct rspamd_config *cfg, GHashTable *vars)
 		return;
 	}
 
-	if (cfg) {
-		opts = ucl_object_lookup (cfg->rcl_obj, "options");
+	if (cfg_obj) {
+		opts = ucl_object_lookup (cfg_obj, "options");
 		if (opts != NULL) {
 			opts = ucl_object_lookup (opts, "lua_path");
 			if (opts != NULL && ucl_object_type (opts) == UCL_STRING) {
@@ -452,7 +452,7 @@ rspamd_init_lua_filters (struct rspamd_config *cfg, gboolean force_load,
 	GString *tb;
 	gint err_idx;
 
-	rspamd_lua_set_path (L, cfg, vars);
+	rspamd_lua_set_path (L, cfg->rcl_obj, vars);
 	cur = g_list_first (cfg->script_modules);
 
 	while (cur) {
diff --git a/src/lua/lua_common.h b/src/lua/lua_common.h
index 82957d3a11..f67401fc28 100644
--- a/src/lua/lua_common.h
+++ b/src/lua/lua_common.h
@@ -280,7 +280,7 @@ gboolean rspamd_lua_check_condition (struct rspamd_config *cfg,
 void rspamd_lua_dumpstack (lua_State *L);
 
 /* Set lua path according to the configuration */
-void rspamd_lua_set_path (lua_State *L, struct rspamd_config *cfg,
+void rspamd_lua_set_path (lua_State *L, const ucl_object_t *cfg_obj,
 		GHashTable *vars);
 
 struct memory_pool_s * rspamd_lua_check_mempool (lua_State * L, gint pos);