add '&' until such time as we clean up the call_env stuff

we likely want to add CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE to the
various configuration item entries.  But we'll look at that a
bit later

diff --git a/src/tests/modules/ldap/module.conf b/src/tests/modules/ldap/module.conf
index a7e49240531e6b14708b847b0fd2dd919e79b921..fcd4cb0635f345e4252e21da92336b9683621041 100644 (file)
--- a/src/tests/modules/ldap/module.conf
+++ b/src/tests/modules/ldap/module.conf
@@ -735,7 +735,7 @@ ldap ldapsasl {
                filter = "(uid=%{%{Stripped-User-Name} || %{User-Name}})"
                sasl {
                        mech = 'SCRAM-SHA-512'
-                       authname = User-Name
+                       authname = &User-Name
                }
        }
 
@@ -782,7 +782,7 @@ ldap ldapldapi {
                filter = "(uid=%{%{Stripped-User-Name} || %{User-Name}})"
                sasl {
                        mech = 'SCRAM-SHA-512'
-                       authname = User-Name
+                       authname = &User-Name
                }
        }
 

diff --git a/src/tests/modules/mschap/module.conf b/src/tests/modules/mschap/module.conf
index 772d41971a64d8404c10efd40ec33322d868b277..edbfd21971f89fa4bf245de9048b33c72fceadd7 100644 (file)
--- a/src/tests/modules/mschap/module.conf
+++ b/src/tests/modules/mschap/module.conf
@@ -1,19 +1,19 @@
 mschap {
 
        attributes {
-               username = User-Name
-               chap_challenge = Vendor-Specific.Microsoft.CHAP-Challenge
-               chap_response = Vendor-Specific.Microsoft.CHAP-Response
-               chap2_response = Vendor-Specific.Microsoft.CHAP2-Response
-               chap2_success = Vendor-Specific.Microsoft.CHAP2-Success
-               chap_error = Vendor-Specific.Microsoft.CHAP-Error
-               chap_mppe_keys = Vendor-Specific.Microsoft.CHAP-MPPE-Keys
-               mppe_recv_key = Vendor-Specific.Microsoft.MPPE-Recv-Key
-               mppe_send_key = Vendor-Specific.Microsoft.MPPE-Send-Key
-               mppe_encryption_policy = Vendor-Specific.Microsoft.MPPE-Encryption-Policy
-               mppe_encryption_types = Vendor-Specific.Microsoft.MPPE-Encryption-Types
-               chap2_cpw =  Vendor-Specific.Microsoft.CHAP2-CPW
-               chap_nt_enc_pw = Vendor-Specific.Microsoft.CHAP-NT-Enc-PW
+               username = &User-Name
+               chap_challenge = &Vendor-Specific.Microsoft.CHAP-Challenge
+               chap_response = &Vendor-Specific.Microsoft.CHAP-Response
+               chap2_response = &Vendor-Specific.Microsoft.CHAP2-Response
+               chap2_success = &Vendor-Specific.Microsoft.CHAP2-Success
+               chap_error = &Vendor-Specific.Microsoft.CHAP-Error
+               chap_mppe_keys = &Vendor-Specific.Microsoft.CHAP-MPPE-Keys
+               mppe_recv_key = &Vendor-Specific.Microsoft.MPPE-Recv-Key
+               mppe_send_key = &Vendor-Specific.Microsoft.MPPE-Send-Key
+               mppe_encryption_policy = &Vendor-Specific.Microsoft.MPPE-Encryption-Policy
+               mppe_encryption_types = &Vendor-Specific.Microsoft.MPPE-Encryption-Types
+               chap2_cpw = &Vendor-Specific.Microsoft.CHAP2-CPW
+               chap_nt_enc_pw = &Vendor-Specific.Microsoft.CHAP-NT-Enc-PW
        }
 
        passchange {
@@ -27,19 +27,19 @@ mschap mschap_winbind {
                domain = %mschap(Domain-Name)
        }
        attributes {
-               username = User-Name
-               chap_challenge = Vendor-Specific.Microsoft.CHAP-Challenge
-               chap_response = Vendor-Specific.Microsoft.CHAP-Response
-               chap2_response = Vendor-Specific.Microsoft.CHAP2-Response
-               chap2_success = Vendor-Specific.Microsoft.CHAP2-Success
-               chap_error = Vendor-Specific.Microsoft.CHAP-Error
-               chap_mppe_keys = Vendor-Specific.Microsoft.CHAP-MPPE-Keys
-               mppe_recv_key = Vendor-Specific.Microsoft.MPPE-Recv-Key
-               mppe_send_key = Vendor-Specific.Microsoft.MPPE-Send-Key
-               mppe_encryption_policy = Vendor-Specific.Microsoft.MPPE-Encryption-Policy
-               mppe_encryption_types = Vendor-Specific.Microsoft.MPPE-Encryption-Types
-               chap2_cpw =  Vendor-Specific.Microsoft.CHAP2-CPW
-               chap_nt_enc_pw = Vendor-Specific.Microsoft.CHAP-NT-Enc-PW
+               username = &User-Name
+               chap_challenge = &Vendor-Specific.Microsoft.CHAP-Challenge
+               chap_response = &Vendor-Specific.Microsoft.CHAP-Response
+               chap2_response = &Vendor-Specific.Microsoft.CHAP2-Response
+               chap2_success = &Vendor-Specific.Microsoft.CHAP2-Success
+               chap_error = &Vendor-Specific.Microsoft.CHAP-Error
+               chap_mppe_keys = &Vendor-Specific.Microsoft.CHAP-MPPE-Keys
+               mppe_recv_key = &Vendor-Specific.Microsoft.MPPE-Recv-Key
+               mppe_send_key = &Vendor-Specific.Microsoft.MPPE-Send-Key
+               mppe_encryption_policy = &Vendor-Specific.Microsoft.MPPE-Encryption-Policy
+               mppe_encryption_types = &Vendor-Specific.Microsoft.MPPE-Encryption-Types
+               chap2_cpw = &Vendor-Specific.Microsoft.CHAP2-CPW
+               chap_nt_enc_pw = &Vendor-Specific.Microsoft.CHAP-NT-Enc-PW
        }
 }
 
@@ -58,19 +58,19 @@ mschap mschap_ntlm {
        }
 
        attributes {
-               username = User-Name
-               chap_challenge = Vendor-Specific.Microsoft.CHAP-Challenge
-               chap_response = Vendor-Specific.Microsoft.CHAP-Response
-               chap2_response = Vendor-Specific.Microsoft.CHAP2-Response
-               chap2_success = Vendor-Specific.Microsoft.CHAP2-Success
-               chap_error = Vendor-Specific.Microsoft.CHAP-Error
-               chap_mppe_keys = Vendor-Specific.Microsoft.CHAP-MPPE-Keys
-               mppe_recv_key = Vendor-Specific.Microsoft.MPPE-Recv-Key
-               mppe_send_key = Vendor-Specific.Microsoft.MPPE-Send-Key
-               mppe_encryption_policy = Vendor-Specific.Microsoft.MPPE-Encryption-Policy
-               mppe_encryption_types = Vendor-Specific.Microsoft.MPPE-Encryption-Types
-               chap2_cpw =  Vendor-Specific.Microsoft.CHAP2-CPW
-               chap_nt_enc_pw = Vendor-Specific.Microsoft.CHAP-NT-Enc-PW
+               username = &User-Name
+               chap_challenge = &Vendor-Specific.Microsoft.CHAP-Challenge
+               chap_response = &Vendor-Specific.Microsoft.CHAP-Response
+               chap2_response = &Vendor-Specific.Microsoft.CHAP2-Response
+               chap2_success = &Vendor-Specific.Microsoft.CHAP2-Success
+               chap_error = &Vendor-Specific.Microsoft.CHAP-Error
+               chap_mppe_keys = &Vendor-Specific.Microsoft.CHAP-MPPE-Keys
+               mppe_recv_key = &Vendor-Specific.Microsoft.MPPE-Recv-Key
+               mppe_send_key = &Vendor-Specific.Microsoft.MPPE-Send-Key
+               mppe_encryption_policy = &Vendor-Specific.Microsoft.MPPE-Encryption-Policy
+               mppe_encryption_types = &Vendor-Specific.Microsoft.MPPE-Encryption-Types
+               chap2_cpw = &Vendor-Specific.Microsoft.CHAP2-CPW
+               chap_nt_enc_pw = &Vendor-Specific.Microsoft.CHAP-NT-Enc-PW
        }
 }
 

diff --git a/src/tests/modules/redis_ippool/module.conf b/src/tests/modules/redis_ippool/module.conf
index 03225e84d05cdbd9a9ba9c2dc614ff7c0440af68..61096783405cf968268acd0667437607c9c5bb39 100644 (file)
--- a/src/tests/modules/redis_ippool/module.conf
+++ b/src/tests/modules/redis_ippool/module.conf
@@ -8,17 +8,17 @@
 #  expansion.
 #
 redis_ippool {
-       owner = Calling-Station-ID
-       gateway = NAS-IP-Address
-       pool_name = control.IP-Pool.Name
+       owner = &Calling-Station-ID
+       gateway = &NAS-IP-Address
+       pool_name = &control.IP-Pool.Name
 
        offer_time = 30
        lease_time = 60
 
-       requested_address = Framed-IP-Address
-       allocated_address_attr = reply.Framed-IP-address
-       range_attr = reply.IP-Pool.Range
-       expiry_attr = reply.Session-Timeout
+       requested_address = &Framed-IP-Address
+       allocated_address_attr = &reply.Framed-IP-address
+       range_attr = &reply.IP-Pool.Range
+       expiry_attr = &reply.Session-Timeout
 
        copy_on_update = yes
 

diff --git a/src/tests/modules/rest/module.conf b/src/tests/modules/rest/module.conf
index 4acc121188c0312380efe657d11a84e902142b73..2f16cdc8b73e71421f11e7747873c9ab6b33a438 100644 (file)
--- a/src/tests/modules/rest/module.conf
+++ b/src/tests/modules/rest/module.conf
@@ -61,7 +61,7 @@ rest {
 
        accounting {
                request {
-                       uri = "https://$ENV{REST_TEST_SERVER}:$ENV{REST_TEST_SERVER_SSL_PORT}/user/%{User-Name}/mac/%{Called-Station-ID}?action=post-authsection=accounting"
+                       uri = "https://$ENV{REST_TEST_SERVER}:$ENV{REST_TEST_SERVER_SSL_PORT}/user/%{User-Name}/mac/%{Called-Station-ID}?action=post-auth&section=accounting"
                        method = 'POST'
                        body = 'json'
                        data = "{\"NAS\": \"%{NAS-IP-Address}\", \"Password\": \"%{User-Password}\", \"Verify\": true}"

diff --git a/src/tests/modules/rest/rest_xlat.unlang b/src/tests/modules/rest/rest_xlat.unlang
index be369006fec191cc53b3147c50cc5ee2c5ccb4ef..57f6e721511d5ff0438bb4b4ebb434e261a12c2b 100644 (file)
--- a/src/tests/modules/rest/rest_xlat.unlang
+++ b/src/tests/modules/rest/rest_xlat.unlang
@@ -102,7 +102,7 @@ if (!(control.NAS-IP-Address == "192.168.1.1")) {
        test_fail
 }
 
-&result_string := "NAS=%{NAS-IP-Address}user=%{User-Name}"
+&result_string := "NAS=%{NAS-IP-Address}&user=%{User-Name}"
 
 # POST to https with POST body data
 &result_string := %rest('POST', "https://%{server_host}:%uri.safe(%{server_ssl_port})/post/test?section=dummy", %{result_string})
@@ -132,7 +132,7 @@ group {
        arguments := (string)%base64.decode(%{arguments})
        body := (string)%base64.decode(%{body})
 
-       if (!(arguments == "{\"station\":\"dummyunsafe=escaped\"}" )) {
+       if (!(arguments == "{\"station\":\"dummy&unsafe=escaped\"}" )) {
                test_fail
        }
 

diff --git a/src/tests/modules/smtp/module.conf b/src/tests/modules/smtp/module.conf
index 282226b1b5ea26644c18f9dd7a5b6f7c4a99c385..af9e096d2996bf8ba0c8d512035fb997977e4aa5 100644 (file)
--- a/src/tests/modules/smtp/module.conf
+++ b/src/tests/modules/smtp/module.conf
@@ -32,18 +32,18 @@ smtp {
        template_directory = "$ENV{top_srcdir}build/ci/exim4"
 
        envelope_address = "postmaster@localhost"
-       attachments = SMTP-Attachments[*]
+       attachments = &SMTP-Attachments[*]
 
        recipients = "conf_recipient_1@localhost"
        recipients = "conf_recipient_2@localhost"
-       recipients = SMTP-Recipients[*]
-       recipients = SMTP-TO[*]
-       recipients = SMTP-CC[*]
+       recipients = &SMTP-Recipients[*]
+       recipients = &SMTP-TO[*]
+       recipients = &SMTP-CC[*]
 
        TO = "conf_to@localhost"
-       TO = SMTP-TO[*]
+       TO = &SMTP-TO[*]
 
-       CC = SMTP-CC[*]
+       CC = &SMTP-CC[*]
 
        set_date = no
 }

diff --git a/src/tests/modules/smtp/smtp_attachment/module.conf b/src/tests/modules/smtp/smtp_attachment/module.conf
index 9a574e5df4470da916d5a3d68cafdba2691d2145..284a4d52262e091664509f27bead453925cf7823 100644 (file)
--- a/src/tests/modules/smtp/smtp_attachment/module.conf
+++ b/src/tests/modules/smtp/smtp_attachment/module.conf
@@ -33,12 +33,12 @@ smtp {
 
        recipients = "conf_recipient_1@localhost"
        recipients = "conf_recipient_2@localhost"
-       recipients = SMTP-Recipients[*]
+       recipients = &SMTP-Recipients[*]
 
        TO = "conf_to@localhost"
-       TO = SMTP-TO[*]
+       TO = &SMTP-TO[*]
 
-       CC = SMTP-CC[*]
+       CC = &SMTP-CC[*]
 
        set_date = no
 }

diff --git a/src/tests/modules/smtp/smtp_crln/module.conf b/src/tests/modules/smtp/smtp_crln/module.conf
index ec81a83d20985107b16c2a16bdb86346628ded1e..43471dede5d1531078961697f9707d7763fcba6b 100644 (file)
--- a/src/tests/modules/smtp/smtp_crln/module.conf
+++ b/src/tests/modules/smtp/smtp_crln/module.conf
@@ -30,7 +30,7 @@ smtp {
        sender_address = "sender_email2@localhost"
        envelope_address = "postmaster@localhost"
        recipients = "crln_test_receiver@localhost"
-       recipients = SMTP-Recipients[*]
+       recipients = &SMTP-Recipients[*]
        set_date = no
 }
 

diff --git a/src/tests/modules/smtp/smtp_stringparse/module.conf b/src/tests/modules/smtp/smtp_stringparse/module.conf
index 16c49a29c2820b8f1a3f577d90ad71bb19bcd76a..755056858963d43db7b6537deb7d2dd18ef3fbeb 100644 (file)
--- a/src/tests/modules/smtp/smtp_stringparse/module.conf
+++ b/src/tests/modules/smtp/smtp_stringparse/module.conf
@@ -23,16 +23,16 @@ smtp {
                message_id = "123456789@example.com"
        }
 
-       username = User-Name
-       password = User-Password
+       username = &User-Name
+       password = &User-Password
 
        uri = "$ENV{SMTP_TEST_SERVER}:$ENV{SMTP_TEST_SERVER_PORT}"
        timeout = 5s
        template_directory = "$ENV{top_srcdir}build/ci/exim4"
-       sender_address = SMTP-Sender-Address[*]
+       sender_address = &SMTP-Sender-Address[*]
        envelope_address = "postmaster@localhost"
        recipients = "conf-stringparse-recipient@localhost"
-       recipients = SMTP-Recipients[*]
+       recipients = &SMTP-Recipients[*]
        set_date = no
 }