From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 6 Dec 2022 16:59:42 +0000 (-0500)
Subject: We don't need to do "%{Attr-Name[#]}" either
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f286118a3a008c42554bb06528ad6847823aa59a;p=thirdparty%2Ffreeradius-server.git

We don't need to do "%{Attr-Name[#]}" either

Just bare xlats are fine now
---

diff --git a/src/tests/keywords/if-multivalue b/src/tests/keywords/if-multivalue
index db3852f1308..33e3e20ea98 100644
--- a/src/tests/keywords/if-multivalue
+++ b/src/tests/keywords/if-multivalue
@@ -111,7 +111,7 @@ if (&Tmp-String-1 =~ /%{Tmp-String-2[#]}$/) {
 #
 #  XLAT virtual comparisons
 #
-if (!(&control.Tmp-Integer-0[*] == "%{control.Tmp-Integer-0[#]}")) {
+if (!(&control.Tmp-Integer-0[*] == %{control.Tmp-Integer-0[#]})) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/redundant-load-balance b/src/tests/keywords/redundant-load-balance
index ef1a03dfe1d..6f190053b33 100644
--- a/src/tests/keywords/redundant-load-balance
+++ b/src/tests/keywords/redundant-load-balance
@@ -52,7 +52,7 @@ foreach &Tmp-Integer-1 {
 	}
 }
 
-if (!(&Tmp-Integer-0 == "%{Tmp-Integer-1[#]}")) {
+if (!(&Tmp-Integer-0 == %{Tmp-Integer-1[#]})) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-attr-ref-null b/src/tests/keywords/update-attr-ref-null
index 2e787f2aad4..a93537026bc 100644
--- a/src/tests/keywords/update-attr-ref-null
+++ b/src/tests/keywords/update-attr-ref-null
@@ -10,7 +10,7 @@ update request {
 	&control !* ANY
 }
 
-if (!("%{Tmp-String-0[#]}" == 2)) {
+if (!(%{Tmp-String-0[#]} == 2)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-filter b/src/tests/keywords/update-filter
index a2bbf3c2bfa..fb76eeab1e9 100644
--- a/src/tests/keywords/update-filter
+++ b/src/tests/keywords/update-filter
@@ -29,11 +29,11 @@ if (!(&Tmp-Integer-0[0] == 10)) {
 	test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 1)) {
+if (!(%{Tmp-Integer-0[#]} == 1)) {
 	test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
 	test_fail
 }
 
@@ -51,7 +51,7 @@ if (!(&Tmp-String-0[0] == 'baz')) {
 	test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 1)) {
+if (!(%{Tmp-String-0[#]} == 1)) {
 	test_fail
 }
 
@@ -69,11 +69,11 @@ if (!(&Tmp-Integer-0[0] == 5)) {
 	test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 1)) {
+if (!(%{Tmp-Integer-0[#]} == 1)) {
 	test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
 	test_fail
 }
 
@@ -96,11 +96,11 @@ if (!(&Tmp-Integer-0[1] == 20)) {
 }
 
 
-if (!("%{Tmp-Integer-0[#]}" == 2)) {
+if (!(%{Tmp-Integer-0[#]} == 2)) {
 	test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
 	test_fail
 }
 
@@ -123,11 +123,11 @@ if (!(&Tmp-Integer-0[1] == 10)) {
 	test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 2)) {
+if (!(%{Tmp-Integer-0[#]} == 2)) {
 	test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
 	test_fail
 }
 
@@ -153,11 +153,11 @@ if (!(&Tmp-Integer-0[2] == 20)) {
 	test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 3)) {
+if (!(%{Tmp-Integer-0[#]} == 3)) {
 	test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
 	test_fail
 }
 
@@ -183,11 +183,11 @@ if (!(&Tmp-Integer-0[2] == 20)) {
 	test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 3)) {
+if (!(%{Tmp-Integer-0[#]} == 3)) {
 	test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
 	test_fail
 }
 
@@ -210,7 +210,7 @@ if (!(&Tmp-String-0[0] == &Tmp-String-1[0])) {
 	test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 1)) {
+if (!(%{Tmp-String-0[#]} == 1)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/update-index b/src/tests/keywords/update-index
index a7c3baa33e8..c4164ff5249 100644
--- a/src/tests/keywords/update-index
+++ b/src/tests/keywords/update-index
@@ -31,7 +31,7 @@ if (!((&control.Reply-Message[0] == 'a')) || (!(&control.Reply-Message[1] == 'd'
 
 # Verify we haven't acquired any extra..
 
-if (!("%{control.Reply-Message[#]}" == 3)) {
+if (!(%{control.Reply-Message[#]} == 3)) {
 	test_fail
 }
 
diff --git a/src/tests/keywords/xlat-virtual-attr b/src/tests/keywords/xlat-virtual-attr
index ef5778cab81..a434c5edbdb 100644
--- a/src/tests/keywords/xlat-virtual-attr
+++ b/src/tests/keywords/xlat-virtual-attr
@@ -71,7 +71,7 @@ if (!("%{Virtual-Server[*]}" == 'default')) {
 	test_fail
 }
 
-if (!("%{Virtual-Server[#]}" == 1)) {
+if (!(%{Virtual-Server[#]} == 1)) {
 	test_fail
 }