move more functions to new syntax

diff --git a/src/tests/ldap_sync/rfc4533/config/radiusd.conf b/src/tests/ldap_sync/rfc4533/config/radiusd.conf
index 142042feb36cf8178772aafefb1c235e7de58cb5..2a5f2257702037d8d19be9994504f7a861bfb76c 100644 (file)
--- a/src/tests/ldap_sync/rfc4533/config/radiusd.conf
+++ b/src/tests/ldap_sync/rfc4533/config/radiusd.conf
@@ -181,7 +181,7 @@ server test {
        }
 
        load Cookie {
-               &control.Tmp-String-0 := "%{ldap:ldap:///%{LDAP-Sync.Directory-Root-DN}?contextCSN?base}"
+               &control.Tmp-String-0 := "%ldap("ldap:///%{LDAP-Sync.Directory-Root-DN}?contextCSN?base")
 
                if (&control.Tmp-String-0 != "") {
                        &reply.LDAP-Sync.Cookie := "rid=000,csn=%{control.Tmp-String-0}"

diff --git a/src/tests/modules/ldap/auth_ssl.unlang b/src/tests/modules/ldap/auth_ssl.unlang
index 91b442426d6505ce8f82b8965930fc82d42f608a..b220b1fdee347dcdb093ccb1219c5f200d0d5644 100644 (file)
--- a/src/tests/modules/ldap/auth_ssl.unlang
+++ b/src/tests/modules/ldap/auth_ssl.unlang
@@ -26,7 +26,7 @@ ldapssl.authenticate
 
 ldapssl.send
 
-&Tmp-String-0 := "%{ldapssl:ldaps:///uid=fred,ou=people,dc=subdept,dc=example,dc=com?description}"
+&Tmp-String-0 := %ldapssl("ldaps:///uid=fred,ou=people,dc=subdept,dc=example,dc=com?description")
 
 if (!(&Tmp-String-0 == "User %{User-Name} authenticated")) {
        test_fail

diff --git a/src/tests/modules/ldap/auth_starttls.unlang b/src/tests/modules/ldap/auth_starttls.unlang
index bdb8485fc824f9ca3a8d06ad49b13e3081b56c17..d16769defc40e8aac6853f71d4397622f3641483 100644 (file)
--- a/src/tests/modules/ldap/auth_starttls.unlang
+++ b/src/tests/modules/ldap/auth_starttls.unlang
@@ -27,7 +27,7 @@ ldaptls.authenticate
 
 ldaptls.send
 
-&Tmp-String-0 := "%{ldaptls:ldap:///uid=joe,ou=people,dc=subdept,dc=example,dc=com?description}"
+&Tmp-String-0 := %ldaptls("ldap:///uid=joe,ou=people,dc=subdept,dc=example,dc=com?description")
 
 if (!(&Tmp-String-0 == "User %{User-Name} authenticated")) {
        test_fail