summaryrefslogtreecommitdiffstats
path: root/src/lua
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-03-21 22:03:44 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-03-21 22:03:44 +0000
commit2b6854531e2cfe19371309c29c398a3f9f422995 (patch)
tree0c18e570de1e484c414bff85096e582d3ea00e08 /src/lua
parent6d7d4b3bf789c7b314ae6335c20f00d991a400df (diff)
downloadrspamd-2b6854531e2cfe19371309c29c398a3f9f422995.tar.gz
rspamd-2b6854531e2cfe19371309c29c398a3f9f422995.zip
Fix composites parsing.
Diffstat (limited to 'src/lua')
-rw-r--r--src/lua/lua_config.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index 178b3f098..6f77612fb 100644
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -28,6 +28,7 @@
#include "message.h"
#include "radix.h"
#include "trie.h"
+#include "expression.h"
/***
* This module is used to configure rspamd and is normally available as global
@@ -1131,7 +1132,7 @@ static gint
lua_config_add_composite (lua_State * L)
{
struct rspamd_config *cfg = lua_check_config (L);
- struct expression *expr;
+ struct rspamd_expression *expr;
gchar *name;
const gchar *expr_str;
struct rspamd_composite *composite;
@@ -1142,8 +1143,8 @@ lua_config_add_composite (lua_State * L)
expr_str = luaL_checkstring (L, 3);
if (name && expr_str) {
- expr = parse_expression (cfg->cfg_pool, (gchar *)expr_str);
- if (expr == NULL) {
+ if (!rspamd_parse_expression (expr_str, 0, &composite_expr_subr,
+ NULL, cfg->cfg_pool, NULL, &expr)) {
msg_err ("cannot parse composite expression %s", expr_str);
}
else {