From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 11 Jun 2022 19:00:16 +0000 (-0400)
Subject: order terminals
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecf4f766508259acfe90d53c7323c42e947e164a;p=thirdparty%2Ffreeradius-server.git

order terminals
---

diff --git a/src/lib/server/cond_tokenize.c b/src/lib/server/cond_tokenize.c
index b4ea5280453..4221d556e81 100644
--- 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 6c9d0a86fe6..77120594b6e 100644
--- 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,