From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 18 Aug 2014 22:43:17 +0000 (-0700)
Subject: Properly find 'actions' property.
X-Git-Tag: 0.7.0~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2323c30e8ee4ac54331cb9e3dd56060254626655;p=thirdparty%2Frspamd.git

Properly find 'actions' property.
---

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index ead59c4bf8..f340b9dbc1 100644
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -255,7 +255,7 @@ static gboolean
 check_metric_settings (struct rspamd_task *task, struct metric *metric,
 	double *score)
 {
-	const ucl_object_t *mobj, *reject;
+	const ucl_object_t *mobj, *reject, *act;
 	double val;
 
 	if (task->settings == NULL) {
@@ -264,11 +264,14 @@ check_metric_settings (struct rspamd_task *task, struct metric *metric,
 
 	mobj = ucl_object_find_key (task->settings, metric->name);
 	if (mobj != NULL) {
-		reject = ucl_object_find_key (mobj,
-				str_action_metric (METRIC_ACTION_REJECT));
-		if (reject != NULL && ucl_object_todouble_safe (reject, &val)) {
-			*score = val;
-			return TRUE;
+		act = ucl_object_find_key (mobj, "actions");
+		if (act != NULL) {
+			reject = ucl_object_find_key (act,
+					str_action_metric (METRIC_ACTION_REJECT));
+			if (reject != NULL && ucl_object_todouble_safe (reject, &val)) {
+				*score = val;
+				return TRUE;
+			}
 		}
 	}