From: Alan T. DeKok Date: Sun, 19 Jan 2025 12:14:25 +0000 (-0500) Subject: add '&' until such time as we clean up the call_env stuff X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76b3eb91e2c04f1e8c387ab3df47427dc7dd07f3;p=thirdparty%2Ffreeradius-server.git 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 a7e49240531..fcd4cb0635f 100644 --- 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 772d41971a6..edbfd21971f 100644 --- 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 03225e84d05..61096783405 100644 --- 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 4acc121188c..2f16cdc8b73 100644 --- 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§ion=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 be369006fec..57f6e721511 100644 --- 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 282226b1b5e..af9e096d299 100644 --- 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 9a574e5df44..284a4d52262 100644 --- 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 ec81a83d209..43471dede5d 100644 --- 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 16c49a29c28..75505685896 100644 --- 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 }