From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 27 Feb 2018 13:00:29 +0000 (+0200)
Subject: [Fix] Deal with non-key arguments in lua_redis.exec_script
X-Git-Tag: 1.7.0~110^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e54b03ed676b1daf34c3a70263297d2f4f43529;p=thirdparty%2Frspamd.git

[Fix] Deal with non-key arguments in lua_redis.exec_script
---

diff --git a/lualib/lua_redis.lua b/lualib/lua_redis.lua
index 2fb7c37818..a23ad781ff 100644
--- a/lualib/lua_redis.lua
+++ b/lualib/lua_redis.lua
@@ -843,7 +843,7 @@ local function add_redis_script(script, redis_params)
 end
 exports.add_redis_script = add_redis_script
 
-local function exec_redis_script(id, params, callback, args)
+local function exec_redis_script(id, params, callback, args, aargs)
   local args_modified = false
 
   if not redis_scripts[id] then
@@ -881,6 +881,11 @@ local function exec_redis_script(id, params, callback, args)
     if not args_modified then
       table.insert(args, 1, tostring(#args))
       table.insert(args, 1, script.sha)
+      if type(aargs) == 'table' then
+        for _, a in ipairs(aargs) do
+          table.insert(args, a)
+        end
+      end
       args_modified = true
     end
 
diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index efca885001..c6e998429e 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -542,7 +542,7 @@ local function dmarc_callback(task)
 
       if report_data then
         rspamd_redis.exec_redis_script(take_report_id, {task = task, is_write = true}, dmarc_report_cb,
-          {2, idx_key, dmarc_domain_key, hfromdom, report_data})
+          {idx_key, dmarc_domain_key}, {hfromdom, report_data})
       end
     end