From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 9 Oct 2023 15:49:01 +0000 (-0400)
Subject: more remove alternation :-
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3de2bb4764e4e588f73068212af5bc134bfd47f;p=thirdparty%2Ffreeradius-server.git

more remove alternation :-
---

diff --git a/src/tests/keywords/xlat-alternation b/src/tests/keywords/xlat-alternation
index c11d5cc679..d843c2ef1d 100644
--- a/src/tests/keywords/xlat-alternation
+++ b/src/tests/keywords/xlat-alternation
@@ -8,7 +8,7 @@
 #
 #  First choice
 #
-&Tmp-String-2 := "%{%{Tmp-String-0}:-%{Tmp-String-1}}"
+&Tmp-String-2 := "%{&Tmp-String-0 || &Tmp-String-1}"
 if (!(&Tmp-String-2 == 'foo')) {
 	test_fail
 }
@@ -17,7 +17,7 @@ if (!(&Tmp-String-2 == 'foo')) {
 #  Second choice
 #
 &request -= &Tmp-String-0[*]
-&Tmp-String-2 := "%{%{Tmp-String-0}:-%{Tmp-String-1}}"
+&Tmp-String-2 := "%{&Tmp-String-0 || &Tmp-String-1}"
 if (!(&Tmp-String-2 == 'bar')) {
 	test_fail
 }
@@ -33,7 +33,7 @@ if (!(&Tmp-String-2 == 'bar foo')) {
 #
 #  Alternation is empty
 #
-&Tmp-String-2 := "%{%{Tmp-String-0}:-}"
+&Tmp-String-2 := "%{&Tmp-String-0 || ''}"
 if (!(&Tmp-String-2 == '')) {
 	test_fail
 }
@@ -47,7 +47,7 @@ if (!(&Tmp-String-2 == '')) {
 #
 #  Both sides are failing, so the assignment returns a NULL string
 #
-&Tmp-String-2 := "%{%{Tmp-String-0}:-%{Tmp-String-1}}"
+&Tmp-String-2 := "%{&Tmp-String-0 || &Tmp-String-1}"
 if (!(&Tmp-String-2 == "")) {
 	test_fail
 }
@@ -57,7 +57,7 @@ if (!(&Tmp-String-2 == "")) {
 #
 &request -= &Tmp-String-2[*]
 
-&Tmp-String-2 := %{%{Tmp-String-0}:-%{Tmp-String-1}}
+&Tmp-String-2 := %{&Tmp-String-0 || &Tmp-String-1}
 if (&Tmp-String-2) {
 	test_fail
 }
diff --git a/src/tests/keywords/xlat-alternation-fail-then-func b/src/tests/keywords/xlat-alternation-fail-then-func
index 9cb9215061..4729389a05 100644
--- a/src/tests/keywords/xlat-alternation-fail-then-func
+++ b/src/tests/keywords/xlat-alternation-fail-then-func
@@ -4,6 +4,6 @@
 &request -= &Tmp-String-0[*]
 &request -= &Tmp-String-1[*]
 
-&Tmp-String-2 := "%{%{Tmp-String-0[0]}:-%{Tmp-String-1[0]}}%(delay_10s:)"
+&Tmp-String-2 := "%{&Tmp-String-0[0] || &Tmp-String-1[0]}%(delay_10s:)"
 
 success
diff --git a/src/tests/keywords/xlat-double-alternation b/src/tests/keywords/xlat-double-alternation
index 4f94291bf8..a883c9866d 100644
--- a/src/tests/keywords/xlat-double-alternation
+++ b/src/tests/keywords/xlat-double-alternation
@@ -1,5 +1,5 @@
 # Regression test for double consecutive alternations
-&Tmp-uint64-0 := "%{%{Acct-Input-Octets}:-2}%{%{Acct-Input-Gigawords}:-1}"
+&Tmp-uint64-0 := "%{&Acct-Input-Octets || "2"}%{&Acct-Input-Gigawords || "1"}"
 if (!(&Tmp-uint64-0 == 21)) {
 	test_fail
 }
diff --git a/src/tests/keywords/xlat-inline b/src/tests/keywords/xlat-inline
index c3d192eb98..7a3fdf22a6 100644
--- a/src/tests/keywords/xlat-inline
+++ b/src/tests/keywords/xlat-inline
@@ -15,8 +15,8 @@ if (!("%(debug:%{Tmp-Integer-0})" == "%{Tmp-Integer-0}")) {
 }
 
 # Check for 'splosions
-"%{%{control.Password.Cleartext}:-%{control.User-Name}}"
-"%{%{control.User-Name}:-%{control.Password.Cleartext}}"
+"%{&control.Password.Cleartext || &control.User-Name}"
+"%{&control.User-Name || &control.Password.Cleartext}"
 
 if (&control.Password.Cleartext =~ /(h)(e)(l)(l)(o)/) {
 	"%{0}"
diff --git a/src/tests/modules/files/module.conf b/src/tests/modules/files/module.conf
index 21a75fdaf2..cfce833fe0 100644
--- a/src/tests/modules/files/module.conf
+++ b/src/tests/modules/files/module.conf
@@ -2,7 +2,7 @@ files {
 	# The default key attribute to use for matches.  The content
 	# of this attribute is used to match the "name" of the
 	# entry.
-	#key = "%{%{Stripped-User-Name}:-%{User-Name}}"
+	#key = "%{&Stripped-User-Name || &User-Name}"
 
 	#  The old "users" style file is now located here.
 	filename = $ENV{MODULE_TEST_DIR}/authorize