From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Tue, 3 May 2011 14:46:33 +0000 (+0400)
Subject: * Whitelist settings now affects on metric's action
X-Git-Tag: 0.3.13~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56586078f92c4cf71fad46e1f4888a49749a6313;p=thirdparty%2Frspamd.git

* Whitelist settings now affects on metric's action
---

diff --git a/src/settings.c b/src/settings.c
index 65dea078ed..af4c37b807 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -456,7 +456,13 @@ check_metric_action_settings (struct worker_task *task, struct metric *metric, d
 
 	if (check_setting (task, &us, &ds)) {
 		if (us != NULL) {
+			/* Check whitelist and set appropriate action for whitelisted users */
+			if (check_whitelist(task, us)) {
+				*result = METRIC_ACTION_NOACTION;
+				return TRUE;
+			}
 			if ((cur = g_hash_table_lookup (us->metric_actions, metric->name)) != NULL) {
+
 				while (cur) {
 					act = cur->data;
 					if (score >= act->score) {
@@ -467,6 +473,11 @@ check_metric_action_settings (struct worker_task *task, struct metric *metric, d
 			}
 		}
 		else if (ds != NULL) {
+			/* Check whitelist and set appropriate action for whitelisted users */
+			if (check_whitelist(task, ds)) {
+				*result = METRIC_ACTION_NOACTION;
+				return TRUE;
+			}
 			if ((cur = g_hash_table_lookup (ds->metric_actions, metric->name)) != NULL) {
 				while (cur) {
 					act = cur->data;