From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 22 Jun 2016 16:34:27 +0000 (+0100)
Subject: [Fix] Fix issues with multiple returns from lua
X-Git-Tag: 1.3.0~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cf201299df667bf4811fbb2e5050b8fa06b7032;p=thirdparty%2Frspamd.git

[Fix] Fix issues with multiple returns from lua
---

diff --git a/src/lua/global_functions.lua b/src/lua/global_functions.lua
index f4f77ce5da..720c99aa1b 100644
--- a/src/lua/global_functions.lua
+++ b/src/lua/global_functions.lua
@@ -142,7 +142,8 @@ function rspamd_redis_make_request(task, redis_params, key, is_write, callback,
     options['dbname'] = redis_params['db']
   end
 
-  return rspamd_redis.make_request(options),addr
+  local ret,conn = rspamd_redis.make_request(options)
+  return ret,conn,addr
 end
 
 function rspamd_str_split(s, sep)
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index cf71f86cb4..a4abf3c9fc 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -2255,7 +2255,7 @@ fuzzy_process_handler (struct rspamd_http_connection_entry *conn_ent,
 
 		/* Check for flag */
 		if (g_hash_table_lookup (rule->mappings,
-			GINT_TO_POINTER (flag)) == NULL) {
+				GINT_TO_POINTER (flag)) == NULL) {
 			msg_info_task ("skip rule %s as it has no flag %d defined"
 					" false", rule->name, flag);
 			cur = g_list_next (cur);
diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua
index 4f8330cd3d..7493f0edea 100644
--- a/src/plugins/lua/ratelimit.lua
+++ b/src/plugins/lua/ratelimit.lua
@@ -211,7 +211,7 @@ local function set_limits(task, args)
   ret,_,upstream = rspamd_redis_make_request(task,
     redis_params, -- connect params
     key, -- hash key
-    false, -- is write
+    true, -- is write
     rate_set_cb, --callback
     cmd, -- command
     fun.totable(fun.map(function(l) return l[2] end, args)) -- arguments