From 0974d1359ce9ab82ab8b41225cf977b5d167580d Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 11 Apr 2021 18:41:58 -0500 Subject: [PATCH] Bugfix: validation is not processing dependencies. There is a return statement that must no longer be there. Make sure to always pass the validation bit. --- level_3/controller/c/private-controller.c | 4 ++++ level_3/controller/c/private-rule.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/level_3/controller/c/private-controller.c b/level_3/controller/c/private-controller.c index df0e2fe..851f948 100644 --- a/level_3/controller/c/private-controller.c +++ b/level_3/controller/c/private-controller.c @@ -1156,6 +1156,10 @@ extern "C" { rule_options |= controller_rule_option_wait; } + if (main.data->parameters[controller_parameter_validate].result == f_console_result_found) { + rule_options |= controller_rule_option_validate; + } + if (entry_action->code & controller_entry_rule_code_asynchronous) { if (main.data->parameters[controller_parameter_validate].result != f_console_result_found) { process_options |= controller_process_option_asynchronous; diff --git a/level_3/controller/c/private-rule.c b/level_3/controller/c/private-rule.c index 7f50aee..13a7f2b 100644 --- a/level_3/controller/c/private-rule.c +++ b/level_3/controller/c/private-rule.c @@ -1700,8 +1700,6 @@ extern "C" { if ((process->options & controller_rule_option_simulate) && main.data->parameters[controller_parameter_validate].result == f_console_result_found) { controller_rule_validate(process->rule, controller_rule_action_type_start, process->options, main, &process->cache); - - return F_none; } f_array_length_t i = 0; @@ -1841,6 +1839,10 @@ extern "C" { rule_options |= controller_rule_option_simulate; } + if (main.data->parameters[controller_parameter_validate].result == f_console_result_found) { + rule_options |= controller_rule_option_validate; + } + // synchronously execute dependency. status = controller_rule_process_begin(controller_process_option_execute, alias_other, controller_rule_action_type_start, rule_options, process->stack, main, process_other->cache); -- 1.8.3.1