diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-11-04 14:28:27 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-11-04 14:28:27 +0000 |
| commit | cc2301c1517da93dfe0867a5a91bafae18001e1a (patch) | |
| tree | e2b30990ae4deded66e429de4e517ea9ff3536b2 | |
| parent | aa597d04d349a420146d777a14cb0f7be1d73c2c (diff) | |
| download | rspamd-cc2301c1517da93dfe0867a5a91bafae18001e1a.tar.gz rspamd-cc2301c1517da93dfe0867a5a91bafae18001e1a.zip | |
[Minor] Fix transforms loading
| -rw-r--r-- | lualib/rspamd_config_transform.lua | 19 | ||||
| -rw-r--r-- | src/libserver/cfg_rcl.c | 2 | ||||
| -rw-r--r-- | src/rspamadm/CMakeLists.txt | 1 |
3 files changed, 19 insertions, 3 deletions
diff --git a/lualib/rspamd_config_transform.lua b/lualib/rspamd_config_transform.lua new file mode 100644 index 000000000..276a1d12f --- /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 304719703..0a60d45f1 100644 --- 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 7e991372a..83c91f8a9 100644 --- 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) |