[Minor] Fix transforms loading

diff --git a/lualib/rspamd_config_transform.lua b/lualib/rspamd_config_transform.lua
new file mode 100644 (file)
index 0000000..276a1d1
--- /dev/null
+++ b/lualib/rspamd_config_transform.lua
@@ -0,0 +1,19 @@
+--[[
+Copyright (c) 2017, Vsevolod Stakhov <vsevolod@highsecure.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+]]--
+
+return function(cfg)
+  return false, nil
+end

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 304719703176b19a797c0cbf7bfd0a860e518d99..0a60d45f1ec99b033d01c3d5b94357cdd693646f 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -3600,8 +3600,6 @@ rspamd_rcl_maybe_apply_lua_transform (struct rspamd_config *cfg)
 
        g_assert (L != NULL);
 
-       msg_err ("hui");
-
        rspamd_snprintf (str, sizeof (str), "return require \"%s\"",
                        transform_script);
 

diff --git a/src/rspamadm/CMakeLists.txt b/src/rspamadm/CMakeLists.txt
index 7e991372ab2a9c337bd7751f09cc88ef7cd107eb..83c91f8a9878e010b2577c57fd58e17bbdb766fe 100644 (file)
--- a/src/rspamadm/CMakeLists.txt
+++ b/src/rspamadm/CMakeLists.txt
@@ -26,7 +26,6 @@ IF (ENABLE_HYPERSCAN MATCHES "ON")
     LIST(APPEND RSPAMADMSRC "${CMAKE_SOURCE_DIR}/src/hs_helper.c")
 ENDIF()
 ADD_EXECUTABLE(rspamadm ${RSPAMADMSRC})
-ADD_DEPENDENCIES(rspamadm rspamadm_lua_preprocess)
 TARGET_LINK_LIBRARIES(rspamadm rspamd-server)
 TARGET_LINK_LIBRARIES(rspamadm ${RSPAMD_REQUIRED_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamadm rspamd-linenoise)