[Minor] Use pure UCL object when setting lua paths

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 5f9d56a20937254b98d873600d7012f3be4be76a..d32fa19192bcabb5bfec3898a6e732026b0dc7e0 100644 (file)
--- 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 3272ee2548ac3143e654029105d6088737bdf727..dcdfef82302ea611efc57c9bcec851f09b7b6a5f 100644 (file)
--- 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 82957d3a1191834da7e813fcc529334a83d89781..f67401fc281106f698bd087e6d90902740d86d46 100644 (file)
--- 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);