From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 11 Oct 2018 16:19:00 +0000 (+0100)
Subject: [Minor] Fix score set in passthrough mode
X-Git-Tag: 1.8.1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=673986f9618514c66f05d13c6f663abc942e44c4;p=thirdparty%2Frspamd.git

[Minor] Fix score set in passthrough mode
---

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index c06df1b773..ba1e821f39 100644
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -489,28 +489,8 @@ rspamd_check_action_metric (struct rspamd_task *task, struct rspamd_metric_resul
 	else {
 		/* Peek the highest priority result */
 		pr = task->result->passthrough_result;
-		sc = NAN;
-
-		if (isnan (pr->target_score)) {
-			for (i = pr->action; i < METRIC_ACTION_MAX; i++) {
-				selected_action = &task->cfg->actions[i];
-				sc = mres->actions_limits[i];
-
-				if (isnan (sc)) {
-					if (i == pr->action) {
-						/* No scores defined, just avoid NaN */
-						sc = 0;
-						break;
-					}
-				}
-				else {
-					break;
-				}
-			}
-		}
-		else {
-			sc = pr->target_score;
-		}
+		sc = pr->target_score;
+		selected_action = &task->cfg->actions[pr->action];
 
 		if (!isnan (sc)) {
 			if (pr->action == METRIC_ACTION_NOACTION) {