From: James Jones <jejones3141@gmail.com>
Date: Mon, 4 Dec 2023 19:02:21 +0000 (-0600)
Subject: Start converting remaining unlang function calls to new syntax
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42e9304e294043eead694f10d5a593aec5e14456;p=thirdparty%2Ffreeradius-server.git

Start converting remaining unlang function calls to new syntax
---

diff --git a/src/tests/modules/ldap/groups_rfc2307bis.unlang b/src/tests/modules/ldap/groups_rfc2307bis.unlang
index 8e743d3c882..16b07f78af3 100644
--- a/src/tests/modules/ldap/groups_rfc2307bis.unlang
+++ b/src/tests/modules/ldap/groups_rfc2307bis.unlang
@@ -6,22 +6,22 @@
 #
 #  Resolve using group name attribute
 #
-if !(%(ldap.memberof:foo) == true) {
+if !(%ldap.memberof("foo") == true) {
         test_fail
 }
 
-if !(%(ldap.memberof:baz) == false) {
+if !(%ldap.memberof("baz") == false) {
         test_fail
 }
 
 #
 #  Resolve using group DN
 #
-if !(%(ldap.memberof:cn=foo,ou=groups,dc=example,dc=com) == true) {
+if !(%ldap.memberof("cn=foo,ou=groups,dc=example,dc=com") == true) {
         test_fail
 }
 
-if !(%(ldap.memberof:cn=baz,ou=groups,dc=example,dc=com) == false) {
+if !(%ldap.memberof("cn=baz,ou=groups,dc=example,dc=com") == false) {
         test_fail
 }
 
diff --git a/src/tests/modules/redis_ippool/pool_tool_static.unlang b/src/tests/modules/redis_ippool/pool_tool_static.unlang
index 5e5a36f2d6a..962a831b093 100644
--- a/src/tests/modules/redis_ippool/pool_tool_static.unlang
+++ b/src/tests/modules/redis_ippool/pool_tool_static.unlang
@@ -43,7 +43,7 @@ if !(&reply.Framed-IP-Address == 192.168.0.10) {
 #
 #  Check the ZSCORE hasn't changed
 #
-if !(%(redis:ZSCORE {%{control.IP-Pool.Name}}:pool %{reply.Framed-IP-Address}) == %{zscore}) {
+if !(%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address}) == %{zscore}) {
 	test_fail
 }
 
@@ -98,7 +98,7 @@ if !(%redis(GET, {%{control.IP-Pool.Name}}:device:11:22:33:44:55:66) == '192.168
 	test_fail
 }
 
-&zscore := %(redis:ZSCORE {%{control.IP-Pool.Name}}:pool 192.168.0.1)
+&zscore := %redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, 192.168.0.1)
 if !(&zscore < (uint64)0x10000000000000) {
 	test_fail
 }
diff --git a/src/tests/modules/unbound/dns.unlang b/src/tests/modules/unbound/dns.unlang
index 05d70f0c838..6512777d7c4 100644
--- a/src/tests/modules/unbound/dns.unlang
+++ b/src/tests/modules/unbound/dns.unlang
@@ -27,7 +27,7 @@ if (&result_ipaddr != 192.168.1.1) {
 	test_fail
 }
 
-&result_string := %dns('1.1.168.192.in-addr.arpa',PTR)
+&result_string := %dns('1.1.168.192.in-addr.arpa', 'PTR')
 
 if (&result_string != 'www.example.com') {
 	test_fail
@@ -57,7 +57,7 @@ if (&Module-Failure-Message != "Can't resolve zero length host") {
 
 # Will return multiple records, though not in a defined sequence.
 # Each returned record is a pair of priority and host values.
-&Filter-Id := %dns(example.com,MX)
+&Filter-Id := %dns(example.com, 'MX')
 
 if !(((&Filter-Id[0] == '10') && (&Filter-Id[1] == 'mail.example.com') && (&Filter-Id[2] == '20') && (&Filter-Id[3] == 'mail2.example.com')) || ((&Filter-Id[2] == '10') && (&Filter-Id[3] == 'mail.example.com') && (&Filter-Id[0] == '20') && (&Filter-Id[1] == 'mail2.example.com'))) {
 	test_fail