From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 17 Aug 2014 17:53:07 +0000 (+0100)
Subject: Really allow to specify multiplier in return value.
X-Git-Tag: 0.7.0~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=795b01a1b5a4998cb3d2b004ce109e0f505076eb;p=thirdparty%2Frspamd.git

Really allow to specify multiplier in return value.
---

diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index 5eddcbb82b..2862c62de8 100644
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -635,11 +635,20 @@ lua_metric_symbol_callback (struct rspamd_task *task, gpointer ud)
 		gboolean res;
 		GList *opts = NULL;
 		gint i;
+		gdouble flag = 1.0;
 
 		if (lua_type (cd->L, level + 1) == LUA_TBOOLEAN) {
 			res = lua_toboolean (cd->L, level + 1);
 			if (res) {
-				for (i = lua_gettop (cd->L); i > level + 1; i --) {
+				gint first_opt = 2;
+
+				if (lua_type (cd->L, level + 2) == LUA_TNUMBER) {
+					flag = lua_tonumber (cd->L, level + 2);
+					/* Shift opt index */
+					first_opt = 3;
+				}
+
+				for (i = lua_gettop (cd->L); i >= level + first_opt; i --) {
 					if (lua_type (cd->L, i) == LUA_TSTRING) {
 						const char *opt = lua_tostring (cd->L, i);
 
@@ -647,7 +656,7 @@ lua_metric_symbol_callback (struct rspamd_task *task, gpointer ud)
 							rspamd_mempool_strdup (task->task_pool, opt));
 					}
 				}
-				insert_result (task, cd->symbol, 1.0, opts);
+				insert_result (task, cd->symbol, flag, opts);
 			}
 		}
 		lua_pop (cd->L, nresults);