Changed from normal to classic

Signed-off-by: Victor Moene <victor.moene@northern.tech>

Author: victormlg

cf-agent/cf-agent.c

@@ -1560,7 +1560,7 @@ static void AllClassesReport(const EvalContext *ctx)
 PromiseResult ScheduleAgentOperations(EvalContext *ctx, const Bundle *bp)
 // NB - this function can be called recursively through "methods"
 {
-    if (EvalContextGetEvalOption(ctx, EVAL_OPTION_NORMAL_EVALUATION))
+    if (EvalContextGetEvalOption(ctx, EVAL_OPTION_CLASSIC_EVALUATION))
     {
         return ScheduleAgentOperationsNormalOrder(ctx, bp);
     }

libpromises/eval_context.h

@@ -108,7 +108,7 @@ typedef enum
 
     EVAL_OPTION_EVAL_FUNCTIONS = 1 << 0,
     EVAL_OPTION_CACHE_SYSTEM_FUNCTIONS = 1 << 1,
-    EVAL_OPTION_NORMAL_EVALUATION = 1 << 2,
+    EVAL_OPTION_CLASSIC_EVALUATION = 1 << 2,
 
     EVAL_OPTION_FULL = 0xFFFFFFFF
 } EvalContextOption;

libpromises/expand.c

@@ -1030,8 +1030,8 @@ static void ResolveControlBody(EvalContext *ctx, GenericAgentConfig *config,
             Log(LOG_LEVEL_VERBOSE, "SET evaluation %s",
                 RvalScalarValue(evaluated_rval));
 
-            bool is_normal = (StringEqual(RvalScalarValue(evaluated_rval), "normal"));
-            EvalContextSetEvalOption(ctx, EVAL_OPTION_NORMAL_EVALUATION, is_normal);
+            bool is_classic = (StringEqual(RvalScalarValue(evaluated_rval), "classic"));
+            EvalContextSetEvalOption(ctx, EVAL_OPTION_CLASSIC_EVALUATION, is_classic);
         }
 
         RvalDestroy(evaluated_rval);

libpromises/mod_common.c

@@ -268,7 +268,7 @@ const ConstraintSyntax CFG_CONTROLBODY[COMMON_CONTROL_MAX + 1] =
     ConstraintSyntaxNewString("tls_min_version", "", "Minimum acceptable TLS version for outgoing connections, defaults to OpenSSL's default", SYNTAX_STATUS_NORMAL),
     ConstraintSyntaxNewStringList("package_inventory", ".*", "Name of the package manager used for software inventory management", SYNTAX_STATUS_NORMAL),
     ConstraintSyntaxNewString("package_module", ".*", "Name of the default package manager", SYNTAX_STATUS_NORMAL),
-    ConstraintSyntaxNewString("evaluation_order", "(normal|top_down)", "Order of evaluation of promises", SYNTAX_STATUS_NORMAL),
+    ConstraintSyntaxNewString("evaluation_order", "(classic|top_down)", "Order of evaluation of promises", SYNTAX_STATUS_NORMAL),
     ConstraintSyntaxNewNull()
 };