From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 19 Dec 2017 18:35:44 +0000 (+0000)
Subject: [Minor] Couple of minor fixes
X-Git-Tag: 1.7.0~330
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e325da73310bc36c61d318f587bbd7655781bd12;p=thirdparty%2Frspamd.git

[Minor] Couple of minor fixes
---

diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index c1e31eb444..c667e1510b 100644
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -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);
 
diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 4a8dc9654a..7d93c31e31 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -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);