From 37f250e80e9e9aee06e4a333b4f8a0ab6d8a3aba Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 18 May 2017 16:32:26 +0100 Subject: [Rework] Propagate ucl variables from the command line --- src/rspamadm/configdump.c | 2 +- src/rspamadm/confighelp.c | 2 +- src/rspamadm/configtest.c | 2 +- src/rspamadm/lua_repl.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/rspamadm') diff --git a/src/rspamadm/configdump.c b/src/rspamadm/configdump.c index 355437b9c..720d6bf51 100644 --- a/src/rspamadm/configdump.c +++ b/src/rspamadm/configdump.c @@ -286,7 +286,7 @@ rspamadm_configdump (gint argc, gchar **argv) /* Do post-load actions */ rspamd_lua_post_load_config (cfg); - if (!rspamd_init_filters (rspamd_main->cfg, FALSE)) { + if (!rspamd_init_filters (rspamd_main->cfg, FALSE, ucl_vars)) { ret = FALSE; } diff --git a/src/rspamadm/confighelp.c b/src/rspamadm/confighelp.c index 591f68652..26251937e 100644 --- a/src/rspamadm/confighelp.c +++ b/src/rspamadm/confighelp.c @@ -250,7 +250,7 @@ rspamadm_confighelp (gint argc, gchar **argv) } /* Init lua modules */ - rspamd_init_lua_filters (cfg, TRUE); + rspamd_init_lua_filters (cfg, TRUE, ucl_vars); if (argc > 1) { for (i = 1; i < argc; i ++) { diff --git a/src/rspamadm/configtest.c b/src/rspamadm/configtest.c index 59f466de2..3a15b976b 100644 --- a/src/rspamadm/configtest.c +++ b/src/rspamadm/configtest.c @@ -146,7 +146,7 @@ rspamadm_configtest (gint argc, gchar **argv) /* Do post-load actions */ rspamd_lua_post_load_config (cfg); - if (!rspamd_init_filters (rspamd_main->cfg, FALSE)) { + if (!rspamd_init_filters (rspamd_main->cfg, FALSE, ucl_vars)) { ret = FALSE; } diff --git a/src/rspamadm/lua_repl.c b/src/rspamadm/lua_repl.c index e3656e8c9..d7d7721a8 100644 --- a/src/rspamadm/lua_repl.c +++ b/src/rspamadm/lua_repl.c @@ -676,7 +676,7 @@ rspamadm_lua (gint argc, gchar **argv) } L = rspamd_lua_init (); - rspamd_lua_set_path (L, NULL); + rspamd_lua_set_path (L, NULL, ucl_vars); if (paths) { for (elt = paths; *elt != NULL; elt ++) { -- cgit v1.2.3