order terminals

diff --git a/src/lib/server/cond_tokenize.c b/src/lib/server/cond_tokenize.c
index b4ea52804537b6b9461032b72b0d126e1a84f1af..4221d556e8179868d3d2b80665d39c0351ea56f1 100644 (file)
--- a/src/lib/server/cond_tokenize.c
+++ b/src/lib/server/cond_tokenize.c
@@ -902,8 +902,9 @@ static ssize_t cond_tokenize_operand(fr_cond_t *c, tmpl_t **out,
 {
        fr_sbuff_term_t const           bareword_terminals =
                                        FR_SBUFF_TERMS(
-                                               L("\n"),
+                                               L(""),                  /* Hack for EOF */
                                                L("\t"),
+                                               L("\n"),
                                                L(" "),
                                                L("!*"),
                                                L("!="),
@@ -921,7 +922,6 @@ static ssize_t cond_tokenize_operand(fr_cond_t *c, tmpl_t **out,
                                                L(">"),
                                                L(">="),
                                                L("||"),                /* Logical operator */
-                                               L("")                   /* Hack for EOF */
                                        );
 
        fr_sbuff_t                      our_in = FR_SBUFF(in);

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index 6c9d0a86fe6910d5e20451243462aa7c92a735fb..77120594b6ea3ba953b09fd3d88ce147b0337fe3 100644 (file)
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -2183,23 +2183,23 @@ static const fr_sbuff_term_t bracket_terms = FR_SBUFF_TERMS(
 );
 
 static const fr_sbuff_term_t operator_terms = FR_SBUFF_TERMS(
-       L(" "),
        L("\t"),
-       L("\r"),
        L("\n"),
+       L("\r"),
+       L(" "),
+       L("!"),
+       L("%"),
+       L("&"),
+       L("*"),
        L("+"),
        L("-"),
        L("/"),
-       L("*"),
+       L("<"),
        L("="),
-       L("%"),
-       L("!"),
-       L("~"),
-       L("&"),
-       L("|"),
-       L("^"),
        L(">"),
-       L("<"),
+       L("^"),
+       L("|"),
+       L("~"),
 );
 
 ssize_t xlat_tokenize_expression(TALLOC_CTX *ctx, xlat_exp_head_t **out, fr_sbuff_t *in,