@@ -308,7 +308,8 @@ rspamadm_configdump (gint argc, gchar **argv, const struct rspamadm_command *cmd | |||
argc, | |||
argv, | |||
cfg->rcl_obj, | |||
"plugins_stats"); | |||
"plugins_stats", | |||
FALSE); | |||
lua_close (L); | |||
@@ -110,7 +110,8 @@ rspamadm_confighelp_show (struct rspamd_config *cfg, gint argc, gchar **argv, | |||
argc, | |||
argv, | |||
obj, | |||
"confighelp"); | |||
"confighelp", | |||
TRUE); | |||
rspamd_fstring_free (out); | |||
return; |
@@ -137,7 +137,8 @@ rspamd_control_finish_handler (struct rspamd_http_connection *conn, | |||
cbdata->argc, | |||
cbdata->argv, | |||
obj, | |||
"fuzzy_stat"); | |||
"fuzzy_stat", | |||
TRUE); | |||
rspamd_fstring_free (out); | |||
ucl_object_unref (obj); |
@@ -135,7 +135,8 @@ rspamadm_fuzzyconvert (gint argc, gchar **argv, const struct rspamadm_command *c | |||
argc, | |||
argv, | |||
obj, | |||
"fuzzy_convert"); | |||
"fuzzy_convert", | |||
TRUE); | |||
ucl_object_unref (obj); | |||
} |
@@ -206,7 +206,9 @@ rspamadm_parse_ucl_var (const gchar *option_name, | |||
gboolean | |||
rspamadm_execute_lua_ucl_subr (gpointer pL, gint argc, gchar **argv, | |||
const ucl_object_t *res, const gchar *script_name) | |||
const ucl_object_t *res, | |||
const gchar *script_name, | |||
gboolean rspamadm_subcommand) | |||
{ | |||
lua_State *L = pL; | |||
gint err_idx, i, ret; | |||
@@ -219,8 +221,14 @@ rspamadm_execute_lua_ucl_subr (gpointer pL, gint argc, gchar **argv, | |||
/* Init internal rspamadm routines */ | |||
rspamd_snprintf (str, sizeof (str), "return require \"%s.%s\"", "rspamadm", | |||
script_name); | |||
if (rspamadm_subcommand) { | |||
rspamd_snprintf (str, sizeof (str), "return require \"%s.%s\"", "rspamadm", | |||
script_name); | |||
} | |||
else { | |||
rspamd_snprintf (str, sizeof (str), "return require \"%s\"", | |||
script_name); | |||
} | |||
if (luaL_dostring (L, str) != 0) { | |||
msg_err ("cannot execute lua script %s: %s", |
@@ -57,6 +57,7 @@ void rspamadm_fill_lua_commands (lua_State *L, GPtrArray *dest); | |||
gboolean rspamadm_execute_lua_ucl_subr (gpointer L, gint argc, gchar **argv, | |||
const ucl_object_t *res, | |||
const gchar *script_name); | |||
const gchar *script_name, | |||
gboolean rspamadm_subcommand); | |||
#endif |
@@ -251,7 +251,8 @@ rspamadm_statconvert (gint argc, gchar **argv, const struct rspamadm_command *cm | |||
argc, | |||
argv, | |||
obj, | |||
"stat_convert"); | |||
"stat_convert", | |||
TRUE); | |||
ucl_object_unref (obj); | |||
} |