]> Kevux Git Server - fll/commitdiff
Bugfix: validation is not processing dependencies.
authorKevin Day <thekevinday@gmail.com>
Sun, 11 Apr 2021 23:41:58 +0000 (18:41 -0500)
committerKevin Day <thekevinday@gmail.com>
Sun, 11 Apr 2021 23:41:58 +0000 (18:41 -0500)
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
level_3/controller/c/private-rule.c

index df0e2fe3028c607681fbcd50b6bb2087af7b736c..851f948f8553795016121e6e2eead2b06e9cc097 100644 (file)
@@ -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;
index 7f50aee13b6bf917cc26438a7d348545a17a0f99..13a7f2b5c1bfc623b6b560e0fa3a521fe8923366 100644 (file)
@@ -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);