Adopt for the new lua ucl API.

diff --git a/src/lua/CMakeLists.txt b/src/lua/CMakeLists.txt
index db9a2b6f613e7f0bc55368301814bb7cb1596c8e..fead8405c5953c85c0a690c5e53bd7021f3ec982 100644 (file)
--- a/src/lua/CMakeLists.txt
+++ b/src/lua/CMakeLists.txt
@@ -28,6 +28,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
        TARGET_LINK_LIBRARIES(rspamd-lua "${LUA_LIBRARY}")
 ENDIF(ENABLE_LUAJIT MATCHES "ON")
 TARGET_LINK_LIBRARIES(rspamd-lua ${GLIB2_LIBRARIES})
+TARGET_LINK_LIBRARIES(rspamd-lua lua-ucl)
 IF(GMIME24)
        TARGET_LINK_LIBRARIES(rspamd-lua ${GMIME24_LIBRARIES})
 ELSE(GMIME24)

diff --git a/src/lua/lua_cfg_file.c b/src/lua/lua_cfg_file.c
index fb65f1d376b86f40e41c71baa11d51e32a108806..83ac4545c7ac1ab288d7ee9ef2fd6e90787f8224 100644 (file)
--- a/src/lua/lua_cfg_file.c
+++ b/src/lua/lua_cfg_file.c
@@ -138,7 +138,7 @@ lua_post_load_config (struct rspamd_config *cfg)
                        /* Key must be a string and value must be a table */
                        name = luaL_checklstring (L, -2, &keylen);
                        if (name != NULL && lua_istable (L, -1)) {
-                               obj = lua_rcl_obj_get (L, -1);
+                               obj = ucl_object_lua_import (L, lua_gettop (L));
                                if (obj != NULL) {
                                        ucl_object_insert_key_merged (cfg->rcl_obj, obj, name, keylen, true);
                                }

diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index 0f047d3b198bd24eaab5b2d483690ce23d78faca..8e57aae94517d99a8cfc85fb7ecde4fc51a45e24 100644 (file)
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -164,7 +164,7 @@ lua_config_get_module_opt (lua_State * L)
                if (mname && optname) {
                        obj = rspamd_config_get_module_opt (cfg, mname, optname);
                        if (obj) {
-                               return lua_rcl_obj_push (L, obj, TRUE);
+                               return ucl_object_push_lua (L, obj, TRUE);
                        }
                }
        }
@@ -199,7 +199,7 @@ lua_config_get_all_opt (lua_State * L)
                if (mname) {
                        obj = ucl_obj_get_key (cfg->rcl_obj, mname);
                        if (obj != NULL) {
-                               return lua_rcl_obj_push (L, obj, TRUE);
+                               return ucl_object_push_lua (L, obj, TRUE);
                        }
                }
        }

diff --git a/src/lua_worker.c b/src/lua_worker.c
index 3bb3621e5b404b7d09ec3b48eccc23425caca128..8aeeb94d15b96f60876da37be7b172c73eca62fc 100644 (file)
--- a/src/lua_worker.c
+++ b/src/lua_worker.c
@@ -203,7 +203,7 @@ lua_worker_get_option (lua_State *L)
                                lua_pushnil (L);
                        }
                        else {
-                               lua_rcl_obj_push (L, val, TRUE);
+                               ucl_object_push_lua (L, val, TRUE);
                        }
                }
        }