From 05d04ed46c4c9e7e79f89b19ea4151c8dc6f0a30 Mon Sep 17 00:00:00 2001 From: Amish <3330468+amishmm@users.noreply.github.com> Date: Thu, 26 Jan 2023 15:54:27 +0530 Subject: [PATCH] Set required_score = reject score and minor change to the report --- src/client/rspamc.cxx | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/client/rspamc.cxx b/src/client/rspamc.cxx index fc1ba0cc1..47362a5e3 100644 --- a/src/client/rspamc.cxx +++ b/src/client/rspamc.cxx @@ -971,14 +971,19 @@ rspamc_metric_output(FILE *out, const ucl_object_t *obj) const auto *thresholds_obj = ucl_object_lookup(obj, "thresholds"); if (thresholds_obj && ucl_object_type(thresholds_obj) == UCL_OBJECT) { - const auto *greylist_obj = ucl_object_lookup(thresholds_obj, "greylist"); - if (greylist_obj) { - greylist_score = ucl_object_todouble(greylist_obj); + const auto *action_obj = ucl_object_lookup(thresholds_obj, "greylist"); + if (action_obj) { + greylist_score = ucl_object_todouble(action_obj); } - const auto *add_header_obj = ucl_object_lookup(thresholds_obj, "add header"); - if (add_header_obj) { - addheader_score = ucl_object_todouble(add_header_obj); + action_obj = ucl_object_lookup(thresholds_obj, "add header"); + if (action_obj) { + addheader_score = ucl_object_todouble(action_obj); + } + + action_obj = ucl_object_lookup(thresholds_obj, "reject"); + if (action_obj) { + required_score = ucl_object_todouble(action_obj); } } @@ -1075,7 +1080,7 @@ rspamc_metric_output(FILE *out, const ucl_object_t *obj) if (humanreport) { fmt::print(out, "Content analysis details: ({} points, {} required)\n\n", emphasis_argument(score, 2), - emphasis_argument(required_score, 2)); + emphasis_argument(addheader_score, 2)); fmt::print(out, " pts rule name description\n"); fmt::print(out, "---- ---------------------- --------------------------------------------------\n"); } -- 2.39.5