Browse Source

[Minor] Couple of minor fixes

tags/1.7.0
Vsevolod Stakhov 6 years ago
parent
commit
e325da7331
2 changed files with 7 additions and 8 deletions
  1. 1
    2
      src/lua/lua_config.c
  2. 6
    6
      src/plugins/surbl.c

+ 1
- 2
src/lua/lua_config.c View File

@@ -1995,7 +1995,7 @@ lua_config_newindex (lua_State *L)

name = luaL_checkstring (L, 2);

if (cfg != NULL && name != NULL && lua_gettop (L) > 2) {
if (cfg != NULL && name != NULL && lua_gettop (L) == 3) {
if (lua_type (L, 3) == LUA_TFUNCTION) {
/* Normal symbol from just a function */
lua_pushvalue (L, 3);
@@ -2070,7 +2070,6 @@ lua_config_newindex (lua_State *L)
if (lua_type (L, -1) == LUA_TSTRING) {
type_str = lua_tostring (L, -1);
type = lua_parse_symbol_type (type_str);

}
lua_pop (L, 1);


+ 6
- 6
src/plugins/surbl.c View File

@@ -791,13 +791,17 @@ surbl_module_config (struct rspamd_config *cfg)
gint nrules = 0;
lua_State *L;

if (!rspamd_config_is_module_enabled (cfg, "surbl")) {
return TRUE;
}

/* Register global methods */
L = cfg->lua_state;
lua_getglobal (L, "rspamd_plugins");

if (lua_type (L, -1) == LUA_TTABLE) {
lua_pushstring (L, "surbl");
lua_createtable (L, 0, 2);
lua_createtable (L, 0, 3);
/* Set methods */
lua_pushstring (L, "register_redirect");
lua_pushcfunction (L, surbl_register_redirect_handler);
@@ -808,16 +812,12 @@ surbl_module_config (struct rspamd_config *cfg)
lua_pushstring (L, "is_redirector");
lua_pushcfunction (L, surbl_is_redirector_handler);
lua_settable (L, -3);
/* Finish fuzzy_check key */
/* Finish surbl key */
lua_settable (L, -3);
}

lua_pop (L, 1); /* Remove global function */

if (!rspamd_config_is_module_enabled (cfg, "surbl")) {
return TRUE;
}

(void)rspamd_symbols_cache_add_symbol (cfg->cache, SURBL_REDIRECTOR_CALLBACK,
0, surbl_test_redirector, NULL,
SYMBOL_TYPE_CALLBACK, -1);

Loading…
Cancel
Save