From 56586078f92c4cf71fad46e1f4888a49749a6313 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 3 May 2011 18:46:33 +0400 Subject: [PATCH] * Whitelist settings now affects on metric's action --- src/settings.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/settings.c b/src/settings.c index 65dea078e..af4c37b80 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; -- 2.39.5