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
FreeRADIUS · Jan 19, 2025 · f4317c8 · f4317c8
1 parent dfda41d
commit f4317c8
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 48 deletions.
diff --git 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
@@ -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
@@ -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