remove '&' from the module tests.

now that the call_env stuff is a little cleaner, we always read
call_env things marked up as 'attribute' via the attribute
tokenizer.

diff --git a/src/tests/modules/mschap/module.conf b/src/tests/modules/mschap/module.conf
index edbfd21971f89fa4bf245de9048b33c72fceadd7..06a14a606b961dd52047bb93c6689540c46ea80a 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
        }
 }