remove & from configuration files in src/tests

largely via Perl auto-replacements, with only a few manual changes

diff --git a/src/tests/auth/chap b/src/tests/auth/chap
index f0b1f9c63ff7b6f0d4c0e5ec1aa9fe16f239fafa..a414323990a67a841b2ba9ce2d65545a4efa961c 100644 (file)
--- a/src/tests/auth/chap
+++ b/src/tests/auth/chap
@@ -5,4 +5,4 @@
 #
 #  Set CHAP-Password
 #
-&CHAP-Password := %chap.password("%{CHAP-Password}")
+CHAP-Password := %chap.password("%{CHAP-Password}")

diff --git a/src/tests/auth/chap_header b/src/tests/auth/chap_header
index c8d5a0856a6467b7009e53160e5a5e261569ada8..271534afffbe83832332bb40bf4accb0d813d087 100644 (file)
--- a/src/tests/auth/chap_header
+++ b/src/tests/auth/chap_header
@@ -1,11 +1,11 @@
 #
 #  over-ride password set in radiusd.conf
 #
-&control.Password := {
-       &Cleartext = 'oracle01'
+control.Password := {
+       Cleartext = 'oracle01'
 }
 
 #
 #  Set CHAP-Password
 #
-&request.CHAP-Password := %chap.password("%{request.CHAP-Password}")
+request.CHAP-Password := %chap.password("%{request.CHAP-Password}")

diff --git a/src/tests/auth/chap_mac_auth b/src/tests/auth/chap_mac_auth
index b40c918750343411fc4ac57479cd2ff2e5f5c364..079c3392ce3a232615a311281d5711ae5170a611 100644 (file)
--- a/src/tests/auth/chap_mac_auth
+++ b/src/tests/auth/chap_mac_auth
@@ -1 +1 @@
-&control.Password.Cleartext := &User-Name
+control.Password.Cleartext := User-Name

diff --git a/src/tests/auth/chap_mac_auth_2 b/src/tests/auth/chap_mac_auth_2
index b40c918750343411fc4ac57479cd2ff2e5f5c364..079c3392ce3a232615a311281d5711ae5170a611 100644 (file)
--- a/src/tests/auth/chap_mac_auth_2
+++ b/src/tests/auth/chap_mac_auth_2
@@ -1 +1 @@
-&control.Password.Cleartext := &User-Name
+control.Password.Cleartext := User-Name

diff --git a/src/tests/auth/digest b/src/tests/auth/digest
index 7919afda7d2e991625e914a359d9f3be329906ea..2bdc13dc9a888978b8c30d6e23ee1ce418235c70 100644 (file)
--- a/src/tests/auth/digest
+++ b/src/tests/auth/digest
@@ -1 +1 @@
-&control.Password.Cleartext := "zanzibar"
+control.Password.Cleartext := "zanzibar"

diff --git a/src/tests/auth/md5_password b/src/tests/auth/md5_password
index a0c540e60bb3c6bec5f298b2473f4777ea8e0aa0..337b2c2471ce56ad7b5fe7ef30d11d6788a80ab1 100644 (file)
--- a/src/tests/auth/md5_password
+++ b/src/tests/auth/md5_password
@@ -1,5 +1,5 @@
 #
 #  over-ride password set in radiusd.conf
 #
-&control -= &Password.Cleartext[*]
-&control.Password.With-Header := '{md5}5d41402abc4b2a76b9719d911017c592'
+control -= Password.Cleartext[*]
+control.Password.With-Header := '{md5}5d41402abc4b2a76b9719d911017c592'

diff --git a/src/tests/auth/password_with_header b/src/tests/auth/password_with_header
index c2041c9e48275b9f9b038914999cb20733aa96a3..8981c5c0661e84fbe3a7af1d35d22e132b99a99f 100644 (file)
--- a/src/tests/auth/password_with_header
+++ b/src/tests/auth/password_with_header
@@ -1,6 +1,6 @@
 #
 #  over-ride password set in radiusd.conf
 #
-&control.Password := {
-       &With-Header = '{clear}hello'
+control.Password := {
+       With-Header = '{clear}hello'
 }

diff --git a/src/tests/auth/password_without_header b/src/tests/auth/password_without_header
index 34d8a7199b8b6299bc4b67632855431045930069..404f35a65b9e3441b7ef654db6adfa7bb34a8481 100644 (file)
--- a/src/tests/auth/password_without_header
+++ b/src/tests/auth/password_without_header
@@ -1,6 +1,6 @@
 #
 #  over-ride password set in radiusd.conf
 #
-&control.Password := {
-       &With-Header = 'hello'
+control.Password := {
+       With-Header = 'hello'
 }

diff --git a/src/tests/auth/unit_test_module.conf b/src/tests/auth/unit_test_module.conf
index 4eaebaaacacdeb33a96237c768b76a0a0164020c..45ed337771d65cdb196caca5b983a5d7cd6b9f35 100644 (file)
--- a/src/tests/auth/unit_test_module.conf
+++ b/src/tests/auth/unit_test_module.conf
@@ -31,7 +31,7 @@ server default {
        }
 
        recv Access-Request {
-               &control.Password.Cleartext := 'hello'
+               control.Password.Cleartext := 'hello'
 
                #
                # Include the test file specified by the

diff --git a/src/tests/bin/unit_test_module.conf b/src/tests/bin/unit_test_module.conf
index 4fb7f8b09696404abb4199bc0a038d994fdf3b53..7b1626b330ad0195c4e74eae7dc95c36dd7b1b9a 100644 (file)
--- a/src/tests/bin/unit_test_module.conf
+++ b/src/tests/bin/unit_test_module.conf
@@ -16,7 +16,7 @@ server default {
        }
 
        recv Access-Request {
-               &control.Auth-Type := ::accept
+               control.Auth-Type := ::accept
        }
 
        recv CoA-Request {

diff --git a/src/tests/digest/config/digest.conf b/src/tests/digest/config/digest.conf
index 40b365b484c3ce8711e2624b097773761f301430..b082434ec040913273c7bf924ee98781f616e2f7 100644 (file)
--- a/src/tests/digest/config/digest.conf
+++ b/src/tests/digest/config/digest.conf
@@ -31,8 +31,8 @@ security {
 
 policy {
        files.authorize {
-               if (&User-Name == "bob") {
-                       &control.Password.Cleartext := "bob"
+               if (User-Name == "bob") {
+                       control.Password.Cleartext := "bob"
                }
        }
        $INCLUDE ${maindir}/policy.d/
@@ -106,27 +106,27 @@ server test {
        }
 
 recv Access-Request {
-       if (&User-Name == "bob") {
+       if (User-Name == "bob") {
                #
                #  Digest-* tests have a password of "zanzibar"
                #  Or, a hashed version thereof.
                #
                if (&Digest-Response) {
-                       if (&Vendor-Specific.Test.Test-Number == "1") {
-                               &control.Password.Cleartext := "zanzibar"
+                       if (Vendor-Specific.Test.Test-Number == "1") {
+                               control.Password.Cleartext := "zanzibar"
                        }
-                       elsif (&Vendor-Specific.Test.Test-Number == "2") {
-                               &control.Digest-Attributes.HA1 := '12af60467a33e8518da5c68bbff12b11'
+                       elsif (Vendor-Specific.Test.Test-Number == "2") {
+                               control.Digest-Attributes.HA1 := '12af60467a33e8518da5c68bbff12b11'
                        }
                }
                else {
-                       &control.Password.Cleartext := "bob"
+                       control.Password.Cleartext := "bob"
                }
        }
 
-       if (&User-Name =~ /^(.*)@test\.example\.com$/) {
-               &Stripped-User-Name := "%{1}"
-               &control.Password.Cleartext := "bob"
+       if (User-Name =~ /^(.*)@test\.example\.com$/) {
+               Stripped-User-Name := "%{1}"
+               control.Password.Cleartext := "bob"
        }
 
        chap

diff --git a/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime b/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime
index c26cc4a2a62966d44c2ab7aa29c886468714313f..b654564a8049f85e6ce0be036f802fe501c61ace 100644 (file)
--- a/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime
+++ b/src/tests/eapol_test/config/aka-prime/mods-enabled/aka-prime
@@ -13,7 +13,7 @@ cache eap_aka_prime_cache {
        #  update <section> { ... }::
        #
        update {
-               &session-state.Session-Data             := &session-state.Session-Data
-               &session-state.Encr-Data.Counter        := &session-state.Encr-Data.Counter
+               session-state.Session-Data              := session-state.Session-Data
+               session-state.Encr-Data.Counter := session-state.Encr-Data.Counter
        }
 }

diff --git a/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime b/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime
index cede95f63c87b085e51684a63ef2e24c20fd624f..0a9aafcfa82bf23a3b5e9d6d17e010d671de9ba5 100644 (file)
--- a/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime
+++ b/src/tests/eapol_test/config/aka-prime/sites-enabled/aka-prime
@@ -6,10 +6,10 @@ server eap-aka-prime {
        }
 
        recv Identity-Response {
-#              %debug_attr(&session-state.)
-               if (!&session-state.Stripped-User-Name) {
-                       &reply.Any-ID-Req := yes
-                       &session-state.Stripped-User-Name := yes
+#              %debug_attr(session-state.)
+               if (!session-state.Stripped-User-Name) {
+                       reply.Any-ID-Req := yes
+                       session-state.Stripped-User-Name := yes
                }
                ok
        }
@@ -19,17 +19,17 @@ server eap-aka-prime {
        }
 
        send Challenge-Request {
-                &control.SIM-Ki  := 0x465b5ce8b199b49faa5f0a2ee238a6bc
-                &control.SIM-Opc := 0xcd63cb71954a9f4e48a5994e37a02baf
-                &control.SIM-SQN := 3
+                control.SIM-Ki  := 0x465b5ce8b199b49faa5f0a2ee238a6bc
+                control.SIM-Opc := 0xcd63cb71954a9f4e48a5994e37a02baf
+                control.SIM-SQN := 3
 
-               &reply.Encr-Data.Next-Reauth-Id := ""
-               &reply.Encr-Data.Next-Pseudonym := ""
+               reply.Encr-Data.Next-Reauth-Id := ""
+               reply.Encr-Data.Next-Pseudonym := ""
        }
 
        send Reauthentication-Request {
-               &reply.Encr-Data.Next-Reauth-Id := ""
-               &reply.Encr-Data.Next-Pseudonym := ""
+               reply.Encr-Data.Next-Reauth-Id := ""
+               reply.Encr-Data.Next-Pseudonym := ""
 
                ok
        }

diff --git a/src/tests/eapol_test/config/aka/mods-enabled/aka b/src/tests/eapol_test/config/aka/mods-enabled/aka
index bd33e25a6821b3a3b099e759481a788943aaa23a..f728770079700be796fc2704a97c0c62f2798198 100644 (file)
--- a/src/tests/eapol_test/config/aka/mods-enabled/aka
+++ b/src/tests/eapol_test/config/aka/mods-enabled/aka
@@ -13,7 +13,7 @@ cache eap_aka_cache {
        #  update <section> { ... }::
        #
        update {
-               &session-state.Session-Data             := &session-state.Session-Data
-               &session-state.Encr-Data.Counter        := &session-state.Encr-Data.Counter
+               session-state.Session-Data              := session-state.Session-Data
+               session-state.Encr-Data.Counter := session-state.Encr-Data.Counter
        }
 }

diff --git a/src/tests/eapol_test/config/aka/sites-enabled/aka b/src/tests/eapol_test/config/aka/sites-enabled/aka
index bd050558ebf83d48e7bdf0639baecb49c64a2b04..b23d4e9cf9aca46e10eb30d885cfbd1c8c9a78f2 100644 (file)
--- a/src/tests/eapol_test/config/aka/sites-enabled/aka
+++ b/src/tests/eapol_test/config/aka/sites-enabled/aka
@@ -7,10 +7,10 @@ server eap-aka {
        }
 
        recv Identity-Response {
-#              %debug_attr(&session-state.)
-               if (!&session-state.Stripped-User-Name) {
-                       &reply.Any-ID-Req := yes
-                       &session-state.Stripped-User-Name := yes
+#              %debug_attr(session-state.)
+               if (!session-state.Stripped-User-Name) {
+                       reply.Any-ID-Req := yes
+                       session-state.Stripped-User-Name := yes
                }
                ok
        }
@@ -20,17 +20,17 @@ server eap-aka {
        }
 
        send Challenge-Request {
-                &control.SIM-Ki  := 0x465b5ce8b199b49faa5f0a2ee238a6bc
-                &control.SIM-Opc := 0xcd63cb71954a9f4e48a5994e37a02baf
-                &control.SIM-SQN := 3
+                control.SIM-Ki  := 0x465b5ce8b199b49faa5f0a2ee238a6bc
+                control.SIM-Opc := 0xcd63cb71954a9f4e48a5994e37a02baf
+                control.SIM-SQN := 3
 
-               &reply.Encr-Data.Next-Reauth-Id := ""
-               &reply.Encr-Data.Next-Pseudonym := ""
+               reply.Encr-Data.Next-Reauth-Id := ""
+               reply.Encr-Data.Next-Pseudonym := ""
        }
 
        send Reauthentication-Request {
-               &reply.Encr-Data.Next-Reauth-Id := ""
-               &reply.Encr-Data.Next-Pseudonym := ""
+               reply.Encr-Data.Next-Reauth-Id := ""
+               reply.Encr-Data.Next-Pseudonym := ""
 
                ok
        }

diff --git a/src/tests/eapol_test/config/peap-client-mschapv2/sites-enabled/peap-client-mschapv2 b/src/tests/eapol_test/config/peap-client-mschapv2/sites-enabled/peap-client-mschapv2
index e699ac716332aef268c9326fc05fc964fe72c9cb..b4fd9d5047f0078be1a49f358bb9218c18992eb3 100644 (file)
--- a/src/tests/eapol_test/config/peap-client-mschapv2/sites-enabled/peap-client-mschapv2
+++ b/src/tests/eapol_test/config/peap-client-mschapv2/sites-enabled/peap-client-mschapv2
@@ -7,7 +7,7 @@ recv Access-Request {
        filter_inner_identity
 
        split_username_nai
-       &control.Password.Cleartext := &Stripped-User-Name
+       control.Password.Cleartext := Stripped-User-Name
 
        chap
        mschap

diff --git a/src/tests/eapol_test/config/peap-mschapv2/sites-enabled/peap-mschapv2 b/src/tests/eapol_test/config/peap-mschapv2/sites-enabled/peap-mschapv2
index e699ac716332aef268c9326fc05fc964fe72c9cb..b4fd9d5047f0078be1a49f358bb9218c18992eb3 100644 (file)
--- a/src/tests/eapol_test/config/peap-mschapv2/sites-enabled/peap-mschapv2
+++ b/src/tests/eapol_test/config/peap-mschapv2/sites-enabled/peap-mschapv2
@@ -7,7 +7,7 @@ recv Access-Request {
        filter_inner_identity
 
        split_username_nai
-       &control.Password.Cleartext := &Stripped-User-Name
+       control.Password.Cleartext := Stripped-User-Name
 
        chap
        mschap

diff --git a/src/tests/eapol_test/config/servers.conf b/src/tests/eapol_test/config/servers.conf
index 74e48db78e009ea01d578223befe7af41d7451d5..dffaaa9b3d649bb169268e419b195785fbe06502 100644 (file)
--- a/src/tests/eapol_test/config/servers.conf
+++ b/src/tests/eapol_test/config/servers.conf
@@ -107,8 +107,8 @@ modules {
 policy {
        files {
                split_username_nai
-               if (&Stripped-User-Name == "bob") {
-                       &control.Password.Cleartext := "bob"
+               if (Stripped-User-Name == "bob") {
+                       control.Password.Cleartext := "bob"
                }
        }
 
@@ -132,21 +132,21 @@ server test {
        }
 
        recv Access-Request {
-               if (&User-Name =~ /with.*client.*cert/) {
-                       &control.EAP-TLS-Require-Client-Cert := yes
+               if (User-Name =~ /with.*client.*cert/) {
+                       control.EAP-TLS-Require-Client-Cert := yes
                }
                files
                eap
-               &reply += {
-                       &NAS-Port = 12345
-                       &Reply-Message = "Powered by FreeRADIUS"
+               reply += {
+                       NAS-Port = 12345
+                       Reply-Message = "Powered by FreeRADIUS"
 
                        &26.1234.56 = 0xdeadbeef
-                       &Vendor-Specific.20.30 = 0xcafecafe
-                       &Vendor-Specific.20.30 = 0xcadecade
+                       Vendor-Specific.20.30 = 0xcafecafe
+                       Vendor-Specific.20.30 = 0xcadecade
 
-                       &Vendor-Specific.Alcatel.FR-Direct-Profile = "Alcatel Profile"
-                       &Vendor-Specific.Alcatel.Home-Agent-UDP-Port = 4130
+                       Vendor-Specific.Alcatel.FR-Direct-Profile = "Alcatel Profile"
+                       Vendor-Specific.Alcatel.Home-Agent-UDP-Port = 4130
                }
        }
 

diff --git a/src/tests/eapol_test/config/sim/mods-enabled/sim b/src/tests/eapol_test/config/sim/mods-enabled/sim
index ef40b99df87433168429272811172c149f77c3be..800837ce07b9d2e6e8d103242bfff4ab8e9ad7dd 100644 (file)
--- a/src/tests/eapol_test/config/sim/mods-enabled/sim
+++ b/src/tests/eapol_test/config/sim/mods-enabled/sim
@@ -13,7 +13,7 @@ cache eap_sim_cache {
        #  update <section> { ... }::
        #
        update {
-               &session-state.Session-Data             := &session-state.Session-Data
-               &session-state.Encr-Data.Counter        := &session-state.Encr-Data.Counter
+               session-state.Session-Data              := session-state.Session-Data
+               session-state.Encr-Data.Counter := session-state.Encr-Data.Counter
        }
 }

diff --git a/src/tests/eapol_test/config/sim/sites-enabled/sim b/src/tests/eapol_test/config/sim/sites-enabled/sim
index 52b06a96a6fd49d914253a43ac7ccfc2cb10f29d..ab0dd41fa56348ff4204d1fc164778f017d770f5 100644 (file)
--- a/src/tests/eapol_test/config/sim/sites-enabled/sim
+++ b/src/tests/eapol_test/config/sim/sites-enabled/sim
@@ -2,10 +2,10 @@ server eap-sim {
        namespace = eap-sim
 
        recv Identity-Response {
-#              %debug_attr(&session-state.)
-               if (!&session-state.Stripped-User-Name) {
-                       &reply.Any-ID-Req := yes
-                       &session-state.Stripped-User-Name := yes
+#              %debug_attr(session-state.)
+               if (!session-state.Stripped-User-Name) {
+                       reply.Any-ID-Req := yes
+                       session-state.Stripped-User-Name := yes
                }
                ok
        }
@@ -15,19 +15,19 @@ server eap-sim {
        }
 
        send Challenge-Request {
-                &control.SIM-Ki  := 0x465b5ce8b199b49faa5f0a2ee238a6bc
-                &control.SIM-Opc := 0xcd63cb71954a9f4e48a5994e37a02baf
-                &control.SIM-SQN := 3
+                control.SIM-Ki  := 0x465b5ce8b199b49faa5f0a2ee238a6bc
+                control.SIM-Opc := 0xcd63cb71954a9f4e48a5994e37a02baf
+                control.SIM-SQN := 3
 
-               &reply.Encr-Data.Next-Reauth-Id := ""
-               &reply.Encr-Data.Next-Pseudonym := ""
+               reply.Encr-Data.Next-Reauth-Id := ""
+               reply.Encr-Data.Next-Pseudonym := ""
 
                ok
        }
 
        send Reauthentication-Request {
-               &reply.Encr-Data.Next-Reauth-Id := ""
-               &reply.Encr-Data.Next-Pseudonym := ""
+               reply.Encr-Data.Next-Reauth-Id := ""
+               reply.Encr-Data.Next-Pseudonym := ""
 
                ok
        }

diff --git a/src/tests/eapol_test/config/tls/mods-enabled/cache b/src/tests/eapol_test/config/tls/mods-enabled/cache
index 1f839d43a94f32c1228aca6ffc37b73ac29b9be4..c25cff57fa90fc36a72234629edf3b13dcb5102e 100644 (file)
--- a/src/tests/eapol_test/config/tls/mods-enabled/cache
+++ b/src/tests/eapol_test/config/tls/mods-enabled/cache
@@ -7,7 +7,7 @@ cache cache_tls_session {
        #
        #  key:: The `cache` key.
        #
-       key = &Session-Id
+       key = Session-Id
 
        #
        #  ttl:: TTL for `cache` entries.
@@ -18,6 +18,6 @@ cache cache_tls_session {
        #  update <section> { ... }::
        #
        update {
-               &reply.Session-Data := &Session-Data
+               reply.Session-Data := Session-Data
        }
 }

diff --git a/src/tests/eapol_test/config/tls/sites-enabled/tls b/src/tests/eapol_test/config/tls/sites-enabled/tls
index e7f5d988041b44f7797cbc4899e8a8cd9ba1eb45..ac50954fb976df221830168e6c14bc7aa8bae1d5 100644 (file)
--- a/src/tests/eapol_test/config/tls/sites-enabled/tls
+++ b/src/tests/eapol_test/config/tls/sites-enabled/tls
@@ -2,7 +2,7 @@ server eap-tls-test {
        namespace = tls
 
        load session {
-               &control.Cache-Allow-Insert := no
+               control.Cache-Allow-Insert := no
 
                cache_tls_session
        }
@@ -12,9 +12,9 @@ server eap-tls-test {
        }
 
        clear session {
-               &control.Cache-Allow-Insert := no
-               &control.Cache-Allow-Merge := no
-               &control.Cache-TTL := 0
+               control.Cache-Allow-Insert := no
+               control.Cache-Allow-Merge := no
+               control.Cache-TTL := 0
 
                cache_tls_session
        }

diff --git a/src/tests/eapol_test/config/ttls-chap/sites-enabled/ttls-chap b/src/tests/eapol_test/config/ttls-chap/sites-enabled/ttls-chap
index e699ac716332aef268c9326fc05fc964fe72c9cb..b4fd9d5047f0078be1a49f358bb9218c18992eb3 100644 (file)
--- a/src/tests/eapol_test/config/ttls-chap/sites-enabled/ttls-chap
+++ b/src/tests/eapol_test/config/ttls-chap/sites-enabled/ttls-chap
@@ -7,7 +7,7 @@ recv Access-Request {
        filter_inner_identity
 
        split_username_nai
-       &control.Password.Cleartext := &Stripped-User-Name
+       control.Password.Cleartext := Stripped-User-Name
 
        chap
        mschap

diff --git a/src/tests/eapol_test/config/ttls-client-eap-mschapv2/sites-enabled/ttls-client-eap-mschapv2 b/src/tests/eapol_test/config/ttls-client-eap-mschapv2/sites-enabled/ttls-client-eap-mschapv2
index e699ac716332aef268c9326fc05fc964fe72c9cb..b4fd9d5047f0078be1a49f358bb9218c18992eb3 100644 (file)
--- a/src/tests/eapol_test/config/ttls-client-eap-mschapv2/sites-enabled/ttls-client-eap-mschapv2
+++ b/src/tests/eapol_test/config/ttls-client-eap-mschapv2/sites-enabled/ttls-client-eap-mschapv2
@@ -7,7 +7,7 @@ recv Access-Request {
        filter_inner_identity
 
        split_username_nai
-       &control.Password.Cleartext := &Stripped-User-Name
+       control.Password.Cleartext := Stripped-User-Name
 
        chap
        mschap

diff --git a/src/tests/eapol_test/config/ttls-client-eap-tls/sites-enabled/ttls-client-eap-tls b/src/tests/eapol_test/config/ttls-client-eap-tls/sites-enabled/ttls-client-eap-tls
index e699ac716332aef268c9326fc05fc964fe72c9cb..b4fd9d5047f0078be1a49f358bb9218c18992eb3 100644 (file)
--- a/src/tests/eapol_test/config/ttls-client-eap-tls/sites-enabled/ttls-client-eap-tls
+++ b/src/tests/eapol_test/config/ttls-client-eap-tls/sites-enabled/ttls-client-eap-tls
@@ -7,7 +7,7 @@ recv Access-Request {
        filter_inner_identity
 
        split_username_nai
-       &control.Password.Cleartext := &Stripped-User-Name
+       control.Password.Cleartext := Stripped-User-Name
 
        chap
        mschap

diff --git a/src/tests/eapol_test/config/ttls-eap-mschapv2/sites-enabled/ttls-eap-mschapv2 b/src/tests/eapol_test/config/ttls-eap-mschapv2/sites-enabled/ttls-eap-mschapv2
index e699ac716332aef268c9326fc05fc964fe72c9cb..b4fd9d5047f0078be1a49f358bb9218c18992eb3 100644 (file)
--- a/src/tests/eapol_test/config/ttls-eap-mschapv2/sites-enabled/ttls-eap-mschapv2
+++ b/src/tests/eapol_test/config/ttls-eap-mschapv2/sites-enabled/ttls-eap-mschapv2
@@ -7,7 +7,7 @@ recv Access-Request {
        filter_inner_identity
 
        split_username_nai
-       &control.Password.Cleartext := &Stripped-User-Name
+       control.Password.Cleartext := Stripped-User-Name
 
        chap
        mschap

diff --git a/src/tests/eapol_test/config/ttls-mschapv2/sites-enabled/ttls-mschapv2 b/src/tests/eapol_test/config/ttls-mschapv2/sites-enabled/ttls-mschapv2
index e699ac716332aef268c9326fc05fc964fe72c9cb..b4fd9d5047f0078be1a49f358bb9218c18992eb3 100644 (file)
--- a/src/tests/eapol_test/config/ttls-mschapv2/sites-enabled/ttls-mschapv2
+++ b/src/tests/eapol_test/config/ttls-mschapv2/sites-enabled/ttls-mschapv2
@@ -7,7 +7,7 @@ recv Access-Request {
        filter_inner_identity
 
        split_username_nai
-       &control.Password.Cleartext := &Stripped-User-Name
+       control.Password.Cleartext := Stripped-User-Name
 
        chap
        mschap

diff --git a/src/tests/eapol_test/config/ttls-pap/sites-enabled/ttls-pap b/src/tests/eapol_test/config/ttls-pap/sites-enabled/ttls-pap
index e699ac716332aef268c9326fc05fc964fe72c9cb..b4fd9d5047f0078be1a49f358bb9218c18992eb3 100644 (file)
--- a/src/tests/eapol_test/config/ttls-pap/sites-enabled/ttls-pap
+++ b/src/tests/eapol_test/config/ttls-pap/sites-enabled/ttls-pap
@@ -7,7 +7,7 @@ recv Access-Request {
        filter_inner_identity
 
        split_username_nai
-       &control.Password.Cleartext := &Stripped-User-Name
+       control.Password.Cleartext := Stripped-User-Name
 
        chap
        mschap

diff --git a/src/tests/eapol_test/config/ttls/sites-enabled/inner-tunnel b/src/tests/eapol_test/config/ttls/sites-enabled/inner-tunnel
index e699ac716332aef268c9326fc05fc964fe72c9cb..b4fd9d5047f0078be1a49f358bb9218c18992eb3 100644 (file)
--- a/src/tests/eapol_test/config/ttls/sites-enabled/inner-tunnel
+++ b/src/tests/eapol_test/config/ttls/sites-enabled/inner-tunnel
@@ -7,7 +7,7 @@ recv Access-Request {
        filter_inner_identity
 
        split_username_nai
-       &control.Password.Cleartext := &Stripped-User-Name
+       control.Password.Cleartext := Stripped-User-Name
 
        chap
        mschap

diff --git a/src/tests/keywords/radius.conf b/src/tests/keywords/radius.conf
index f0b9b527211f510c8d97e023b1c81a1260b0093c..ffc2ff1f911189c9b989ede3d1eac0e665b09727 100644 (file)
--- a/src/tests/keywords/radius.conf
+++ b/src/tests/keywords/radius.conf
@@ -50,7 +50,7 @@ modules {
 
        exec {
                wait = yes
-               input_pairs = &request
+               input_pairs = request
                shell_escape = yes
                env_inherit = no
                timeout = 1

diff --git a/src/tests/ldap_sync/active_directory/config/radiusd.conf b/src/tests/ldap_sync/active_directory/config/radiusd.conf
index c9eac7b2ca509584f9993c0cdb86f91f7d117ccb..75effe3fcdc4e8b11f29755cf3a333b34739a42f 100644 (file)
--- a/src/tests/ldap_sync/active_directory/config/radiusd.conf
+++ b/src/tests/ldap_sync/active_directory/config/radiusd.conf
@@ -120,8 +120,8 @@ server test {
                        scope = 'sub'
 
                        update {
-                               &Proto.radius.User-Name = 'sAMAccountName'
-                               &SMB-Account-CTRL = 'userAccountControl'
+                               Proto.radius.User-Name = 'sAMAccountName'
+                               SMB-Account-CTRL = 'userAccountControl'
                        }
 
                        trigger {
@@ -135,9 +135,9 @@ server test {
                        sub = "one"
 
                        update {
-                               &Proto.radius.User-Name = 'sAMAccountName'
-                               &SMB-Account-CTRL = 'userAccountControl'
-                               &User-Category = 'isDeleted'
+                               Proto.radius.User-Name = 'sAMAccountName'
+                               SMB-Account-CTRL = 'userAccountControl'
+                               User-Category = 'isDeleted'
                        }
                }
        }
@@ -162,7 +162,7 @@ server test {
                #  so we can check the output
                #
                if (&LDAP-Sync.Entry-DN =~ /(CN=.+:)[a-f0-9-]+(,CN=Deleted Objects,DC=example,DC=com)/) {
-                       &request.LDAP-Sync.Entry-DN := "%{1}oldid%{2}"
+                       request.LDAP-Sync.Entry-DN := "%{1}oldid%{2}"
                }
                linelog
        }

diff --git a/src/tests/ldap_sync/persistent_search/config/radiusd.conf b/src/tests/ldap_sync/persistent_search/config/radiusd.conf
index 8c7d804bdb144fa61a84378a96095515f43cf312..543c2838e6edcdf114432faa518ebdb878d880ad 100644 (file)
--- a/src/tests/ldap_sync/persistent_search/config/radiusd.conf
+++ b/src/tests/ldap_sync/persistent_search/config/radiusd.conf
@@ -41,17 +41,17 @@ trigger {
 
 policy {
        linelogprep {
-               if (&LDAP-Sync.DN == 'ou=people,dc=example,dc=com') {
-                       &control.LDAP-Sync.DN := 'people'
+               if (LDAP-Sync.DN == 'ou=people,dc=example,dc=com') {
+                       control.LDAP-Sync.DN := 'people'
                } else {
-                       &control.LDAP-Sync.DN := 'group'
+                       control.LDAP-Sync.DN := 'group'
                }
-               &Linelog-Entry := "%{Packet-Type} %{LDAP-Sync.DN} %{LDAP-Sync.Entry-DN} %{LDAP-Sync.Original-DN} %{Proto.radius.User-Name}"
+               Linelog-Entry := "%{Packet-Type} %{LDAP-Sync.DN} %{LDAP-Sync.Entry-DN} %{LDAP-Sync.Original-DN} %{Proto.radius.User-Name}"
        }
 
        grouplog {
                foreach name (Stripped-User-Name[*]) {
-                       &Linelog-Entry := "Group member %{name}"
+                       Linelog-Entry := "Group member %{name}"
                        linelog
                }
        }
@@ -67,7 +67,7 @@ client localhost {
 modules {
 
        linelog {
-               format = &Linelog-Entry
+               format = Linelog-Entry
                destination = file
 
                file {
@@ -139,8 +139,8 @@ server test {
                        scope = 'sub'
 
                        update {
-                               &Proto.radius.User-Name = 'uid'
-                               &Password.With-Header = 'userPassword'
+                               Proto.radius.User-Name = 'uid'
+                               Password.With-Header = 'userPassword'
                        }
 
                        trigger {
@@ -154,8 +154,8 @@ server test {
                        scope = "sub"
 
                        update {
-                               &Stripped-User-Name += "member"
-                               &User-Category = 'cn'
+                               Stripped-User-Name += "member"
+                               User-Category = 'cn'
                        }
                }
        }

diff --git a/src/tests/ldap_sync/rfc4533/config/radiusd.conf b/src/tests/ldap_sync/rfc4533/config/radiusd.conf
index 6a7608c74b66995fd04b2a7d27b439235355cfc7..4c6b6571ed6800f560f7072f79839ad10ff83e6f 100644 (file)
--- a/src/tests/ldap_sync/rfc4533/config/radiusd.conf
+++ b/src/tests/ldap_sync/rfc4533/config/radiusd.conf
@@ -41,17 +41,17 @@ trigger {
 
 policy {
        linelogprep {
-               if (&LDAP-Sync.DN == 'ou=people,dc=example,dc=com') {
-                       &control.LDAP-Sync.DN := 'people'
+               if (LDAP-Sync.DN == 'ou=people,dc=example,dc=com') {
+                       control.LDAP-Sync.DN := 'people'
                } else {
-                       &control.LDAP-Sync.DN := 'group'
+                       control.LDAP-Sync.DN := 'group'
                }
-               &Linelog-Entry := "%{Packet-Type} %{LDAP-Sync.DN} %{LDAP-Sync.Entry-DN} %{Proto.radius.User-Name}"
+               Linelog-Entry := "%{Packet-Type} %{LDAP-Sync.DN} %{LDAP-Sync.Entry-DN} %{Proto.radius.User-Name}"
        }
 
        grouplog {
                foreach name (Stripped-User-Name[*]) {
-                       &Linelog-Entry := "Group member %{name}"
+                       Linelog-Entry := "Group member %{name}"
                        linelog
                }
        }
@@ -89,7 +89,7 @@ modules {
        }
 
        linelog {
-               format = &Linelog-Entry
+               format = Linelog-Entry
                destination = file
 
                file {
@@ -170,8 +170,8 @@ server test {
                        filter = "(objectClass=posixAccount)"
 
                        update {
-                               &Proto.radius.User-Name = 'uid'
-                               &Password.With-Header = 'userPassword'
+                               Proto.radius.User-Name = 'uid'
+                               Password.With-Header = 'userPassword'
                        }
 
                        trigger {
@@ -185,8 +185,8 @@ server test {
                        scope = "sub"
 
                        update {
-                               &Stripped-User-Name += "member"
-                               &User-Category = 'cn'
+                               Stripped-User-Name += "member"
+                               User-Category = 'cn'
                        }
                }
        }
@@ -194,12 +194,12 @@ server test {
        load Cookie {
                string csn
 
-               &csn := %concat(%ldap("ldap:///%ldap.uri.safe(%{LDAP-Sync.Directory-Root-DN})?contextCSN?base"), ';')
-               &reply.LDAP-Sync.Cookie := "rid=000,csn=%{csn}"
+               csn := %concat(%ldap("ldap:///%ldap.uri.safe(%{LDAP-Sync.Directory-Root-DN})?contextCSN?base"), ';')
+               reply.LDAP-Sync.Cookie := "rid=000,csn=%{csn}"
        }
 
        store Cookie {
-               &Linelog-Entry := &LDAP-Sync.Cookie
+               Linelog-Entry := LDAP-Sync.Cookie
                cookielog
        }
 

diff --git a/src/tests/map/base b/src/tests/map/base
index 38666f9873e6d661cf4b52e425a0957d4a342a26..aba08dd73d27dd16739c659987275bb8c6ec11cf 100644 (file)
--- a/src/tests/map/base
+++ b/src/tests/map/base
@@ -1,6 +1,6 @@
 update request {
-       &Filter-Id[*] := "filter"
-       &User-Name[*] := "blah"
+       Filter-Id[*] := "filter"
+       User-Name[*] := "blah"
 
-       &reply.Filter-Id[*] += &request.Filter-Id[*]
+       reply.Filter-Id[*] += request.Filter-Id[*]
 }

diff --git a/src/tests/map/count-error b/src/tests/map/count-error
index 2bb9018f1ab1665a7e99cda181fee4f810e831ba..f76ac1f6eb135e55a2a45ef8f759bc751ac3ba14 100644 (file)
--- a/src/tests/map/count-error
+++ b/src/tests/map/count-error
@@ -2,5 +2,5 @@
 #      This should be an xlat, not a direct assignment
 #
 update request {
-       &NAS-Port := &Filter-Id[#]      # ERROR
+       NAS-Port := Filter-Id[#]        # ERROR
 }

diff --git a/src/tests/map/count-list-error b/src/tests/map/count-list-error
index 48fdfa40e89d3d93619ab410ae760cc1762b3276..d2fcc2e11a776f2c0e5773db84b4eaf0948a00ad 100644 (file)
--- a/src/tests/map/count-list-error
+++ b/src/tests/map/count-list-error
@@ -2,5 +2,5 @@
 #      Updating lists isn't allowed
 #
 update {
-       &request.Filter-Id := &Filter-Id[#]     # ERROR
+       request.Filter-Id := Filter-Id[#]       # ERROR
 }

diff --git a/src/tests/performance/ack.conf b/src/tests/performance/ack.conf
index 3fd669c2764e7889e7c8de5286c7b354bbe024db..22f68f034fe9d813c99fc85c27b2280dea891a0f 100644 (file)
--- a/src/tests/performance/ack.conf
+++ b/src/tests/performance/ack.conf
@@ -44,7 +44,7 @@ server default {
                secret = testing123
        }
        recv Access-Request {
-               &control.Auth-Type := ::Accept
+               control.Auth-Type := ::Accept
        }
        send Access-Accept {
        }

diff --git a/src/tests/performance/proxy.conf b/src/tests/performance/proxy.conf
index e219a37992a598b5eb522aece0e8e36107cc9aa6..e0b2baea0ccf39a85b84545fd6077c0f36bb4815 100644 (file)
--- a/src/tests/performance/proxy.conf
+++ b/src/tests/performance/proxy.conf
@@ -45,7 +45,7 @@ server default {
        }
 
        recv Access-Request {
-               &control.Auth-Type := ::proxy
+               control.Auth-Type := ::proxy
        }
        authenticate proxy {
                radius_auth
@@ -56,8 +56,8 @@ server default {
        }
 
        recv Accounting-Request {
-               if (!&Event-Timestamp) {
-                       &Event-Timestamp = "%l" # only sets it if there's no Event-Timestamp
+               if (!Event-Timestamp) {
+                       Event-Timestamp = "%l" # only sets it if there's no Event-Timestamp
                }
                radius_acct
        }

diff --git a/src/tests/process/dhcpv4/Ack b/src/tests/process/dhcpv4/Ack
index a027e4d2404464e476b06a00b6a49ab11a5b88b9..992b28b17e93dcbe96b24f101e97fb092036d952 100644 (file)
--- a/src/tests/process/dhcpv4/Ack
+++ b/src/tests/process/dhcpv4/Ack
@@ -1,48 +1,48 @@
 subrequest DHCPv4.Request {
        # Client -> Server
-       &request += {
-               &Message-Type = Request
+       request += {
+               Message-Type = Request
 
-               &Hardware-Type = Ethernet
-               &Hardware-Address-Length = 6
-               &Hop-Count = 0
-               &Transaction-Id = 15646
-               &Number-of-Seconds = 0
-               &Flags = 0
+               Hardware-Type = Ethernet
+               Hardware-Address-Length = 6
+               Hop-Count = 0
+               Transaction-Id = 15646
+               Number-of-Seconds = 0
+               Flags = 0
 
-               &Client-IP-Address = 0.0.0.0
-               &Your-IP-Address = 0.0.0.0
-               &Server-IP-Address = 0.0.0.0
-               &Gateway-IP-Address = 0.0.0.0
-               &Client-Hardware-Address = ca:fe:ca:fe:ca:fe
-               &Client-Identifier = 0x01020304050607
-               &Requested-IP-Address = 192.168.0.10
+               Client-IP-Address = 0.0.0.0
+               Your-IP-Address = 0.0.0.0
+               Server-IP-Address = 0.0.0.0
+               Gateway-IP-Address = 0.0.0.0
+               Client-Hardware-Address = ca:fe:ca:fe:ca:fe
+               Client-Identifier = 0x01020304050607
+               Requested-IP-Address = 192.168.0.10
 
-               &Server-Identifier = 192.168.0.1
-               &Parameter-Request-List = Subnet-Mask
-               &Parameter-Request-List = Router-Address
-               &Parameter-Request-List = Domain-Name
-               &Parameter-Request-List = Domain-Name-Server
-               &Parameter-Request-List = NTP-Servers
-               &Network-Subnet = 0.0.0.0/32
+               Server-Identifier = 192.168.0.1
+               Parameter-Request-List = Subnet-Mask
+               Parameter-Request-List = Router-Address
+               Parameter-Request-List = Domain-Name
+               Parameter-Request-List = Domain-Name-Server
+               Parameter-Request-List = NTP-Servers
+               Network-Subnet = 0.0.0.0/32
        }
 
        call dhcpv4 {
                # 'Discover' expects 'Ack'
-               if (&reply.Packet-Type != Ack) {
+               if (reply.Packet-Type != Ack) {
                        test_fail
                }
 
                # We should reply the below attributes...
-               if (!&reply.Transaction-Id) {
+               if (!reply.Transaction-Id) {
                        test_fail
                }
 
-               if (&reply.Subnet-Mask != "255.255.255.0") {
+               if (reply.Subnet-Mask != "255.255.255.0") {
                        test_fail
                }
 
-               if (&reply.Gateway-IP-Address != "0.0.0.0") {
+               if (reply.Gateway-IP-Address != "0.0.0.0") {
                        test_fail
                }
        }

diff --git a/src/tests/process/dhcpv4/Discover b/src/tests/process/dhcpv4/Discover
index 10695773daa16b4911386316914f2ec94707d34e..12f8f007b223524838514438bfa5a345b1a41957 100644 (file)
--- a/src/tests/process/dhcpv4/Discover
+++ b/src/tests/process/dhcpv4/Discover
@@ -1,48 +1,48 @@
 subrequest DHCPv4.Discover {
        # Server -> Client
-       &request += {
-               &Message-Type = Discover
-
-               &Hardware-Type = Ethernet
-               &Hardware-Address-Length = 6
-               &Hop-Count = 0
-               &Transaction-Id = 12345
-               &Number-of-Seconds = 0
-               &Flags = 0
-
-               &Client-IP-Address = 0.0.0.0
-               &Your-IP-Address = 0.0.0.0
-               &Server-IP-Address = 0.0.0.0
-               &Gateway-IP-Address = 0.0.0.0
-               &Client-Hardware-Address = ca:fe:ca:fe:ca:fe
-               &Client-Identifier = 0x01020304050607
-               &Requested-IP-Address = 0.0.0.0
-
-
-               &Parameter-Request-List = Subnet-Mask
-               &Parameter-Request-List = Router-Address
-               &Parameter-Request-List = Domain-Name
-               &Parameter-Request-List = Domain-Name-Server
-               &Parameter-Request-List = NTP-Servers
-               &Network-Subnet = 0.0.0.0/32
+       request += {
+               Message-Type = Discover
+
+               Hardware-Type = Ethernet
+               Hardware-Address-Length = 6
+               Hop-Count = 0
+               Transaction-Id = 12345
+               Number-of-Seconds = 0
+               Flags = 0
+
+               Client-IP-Address = 0.0.0.0
+               Your-IP-Address = 0.0.0.0
+               Server-IP-Address = 0.0.0.0
+               Gateway-IP-Address = 0.0.0.0
+               Client-Hardware-Address = ca:fe:ca:fe:ca:fe
+               Client-Identifier = 0x01020304050607
+               Requested-IP-Address = 0.0.0.0
+
+
+               Parameter-Request-List = Subnet-Mask
+               Parameter-Request-List = Router-Address
+               Parameter-Request-List = Domain-Name
+               Parameter-Request-List = Domain-Name-Server
+               Parameter-Request-List = NTP-Servers
+               Network-Subnet = 0.0.0.0/32
        }
 
        call dhcpv4 {
                # 'Discover' expects 'Offer'
-               if (&reply.Packet-Type != Offer) {
+               if (reply.Packet-Type != Offer) {
                        test_fail
                }
 
                # We should reply the below attributes...
-               if (!&reply.Transaction-Id) {
+               if (!reply.Transaction-Id) {
                        test_fail
                }
 
-               if (&reply.Subnet-Mask != "255.255.255.0") {
+               if (reply.Subnet-Mask != "255.255.255.0") {
                        test_fail
                }
 
-               if (&reply.Gateway-IP-Address != "0.0.0.0") {
+               if (reply.Gateway-IP-Address != "0.0.0.0") {
                        test_fail
                }
        }

diff --git a/src/tests/process/dhcpv4/server.conf b/src/tests/process/dhcpv4/server.conf
index 99802497f0eabbdbc9b3b0a2acf532cf1d6ac3a2..493c76aba94cfb0bb15a0bca76d3480745102306 100644 (file)
--- a/src/tests/process/dhcpv4/server.conf
+++ b/src/tests/process/dhcpv4/server.conf
@@ -47,50 +47,50 @@ server dhcpv4 {
        }
 
        recv Discover {
-               &reply += {
-                       &Hardware-Type = Ethernet
-                       &Hardware-Address-Length = 6
-                       &Hop-Count = 0
-                       &Transaction-Id = 15645
-                       &Number-of-Seconds = 0
-                       &Flags = 0
-                       &Client-IP-Address = 0.0.0.0
-                       &Your-IP-Address = 192.168.0.10
-                       &Server-IP-Address = 192.168.0.1
-                       &Gateway-IP-Address = 0.0.0.0
-                       &Client-Hardware-Address = ca:fe:ca:fe:ca:fe
-                       &Message-Type = Offer
-                       &Subnet-Mask = 255.255.255.0
-                       &Renewal-Time = 1800
-                       &Rebinding-Time = 3150
-                       &IP-Address-Lease-Time = 3600
-                       &Server-Identifier = 192.168.0.1
-                       &Network-Subnet = 0.0.0.0/32
-                       &Domain-Name = "lorisdoancapistao.com"
+               reply += {
+                       Hardware-Type = Ethernet
+                       Hardware-Address-Length = 6
+                       Hop-Count = 0
+                       Transaction-Id = 15645
+                       Number-of-Seconds = 0
+                       Flags = 0
+                       Client-IP-Address = 0.0.0.0
+                       Your-IP-Address = 192.168.0.10
+                       Server-IP-Address = 192.168.0.1
+                       Gateway-IP-Address = 0.0.0.0
+                       Client-Hardware-Address = ca:fe:ca:fe:ca:fe
+                       Message-Type = Offer
+                       Subnet-Mask = 255.255.255.0
+                       Renewal-Time = 1800
+                       Rebinding-Time = 3150
+                       IP-Address-Lease-Time = 3600
+                       Server-Identifier = 192.168.0.1
+                       Network-Subnet = 0.0.0.0/32
+                       Domain-Name = "lorisdoancapistao.com"
                }
                ok
        }
 
        recv Request {
-               &reply += {
-                       &Hardware-Type = Ethernet
-                       &Hardware-Address-Length = 6
-                       &Hop-Count = 0
-                       &Transaction-Id = 15646
-                       &Number-of-Seconds = 0
-                       &Flags = 0
-                       &Client-IP-Address = 0.0.0.0
-                       &Your-IP-Address = 192.168.0.10
-                       &Server-IP-Address = 0.0.0.0
-                       &Gateway-IP-Address = 0.0.0.0
-                       &Client-Hardware-Address = ca:fe:ca:fe:ca:fe
-                       &Message-Type = Ack
-                       &Renewal-Time = 1800
-                       &Rebinding-Time = 3150
-                       &IP-Address-Lease-Time = 3600
-                       &Server-Identifier = 192.168.0.1
-                       &Subnet-Mask = 255.255.255.0
-                       &Network-Subnet = 0.0.0.0/32
+               reply += {
+                       Hardware-Type = Ethernet
+                       Hardware-Address-Length = 6
+                       Hop-Count = 0
+                       Transaction-Id = 15646
+                       Number-of-Seconds = 0
+                       Flags = 0
+                       Client-IP-Address = 0.0.0.0
+                       Your-IP-Address = 192.168.0.10
+                       Server-IP-Address = 0.0.0.0
+                       Gateway-IP-Address = 0.0.0.0
+                       Client-Hardware-Address = ca:fe:ca:fe:ca:fe
+                       Message-Type = Ack
+                       Renewal-Time = 1800
+                       Rebinding-Time = 3150
+                       IP-Address-Lease-Time = 3600
+                       Server-Identifier = 192.168.0.1
+                       Subnet-Mask = 255.255.255.0
+                       Network-Subnet = 0.0.0.0/32
                }
                ok
        }

diff --git a/src/tests/process/dhcpv6/Request b/src/tests/process/dhcpv6/Request
index aca92327a940f110adf116954bc3b392a8997fa2..873efdc8fea61d06d6dfb1a661fa4d85d308a437 100644 (file)
--- a/src/tests/process/dhcpv6/Request
+++ b/src/tests/process/dhcpv6/Request
@@ -1,40 +1,40 @@
 subrequest DHCPv6.Request {
-       &Transaction-ID = 0x1e291d
+       Transaction-ID = 0x1e291d
 
-       &Server-ID.DUID = LLT
-       &Server-ID.DUID.LLT.Hardware-Type = Ethernet
-       &Server-ID.DUID.LLT.Time = "Nov 21 2012 08:36:00 UTC"
-       &Server-ID.DUID.LLT.Hardware-Type.Ethernet.Address = 00:11:22:33:44:55
+       Server-ID.DUID = LLT
+       Server-ID.DUID.LLT.Hardware-Type = Ethernet
+       Server-ID.DUID.LLT.Time = "Nov 21 2012 08:36:00 UTC"
+       Server-ID.DUID.LLT.Hardware-Type.Ethernet.Address = 00:11:22:33:44:55
 
-       &Client-ID.DUID = LL
-       &Client-ID.DUID.LL.Hardware-Type = Ethernet
-       &Client-ID.DUID.LL.Hardware-Type.Ethernet.Address = 00:01:02:03:04:05
+       Client-ID.DUID = LL
+       Client-ID.DUID.LL.Hardware-Type = Ethernet
+       Client-ID.DUID.LL.Hardware-Type.Ethernet.Address = 00:01:02:03:04:05
 
-       &request += {
-               &Option-Request = DNS-Servers
-               &Option-Request = AFTR-Name
+       request += {
+               Option-Request = DNS-Servers
+               Option-Request = AFTR-Name
        }
 
-       &Elapsed-Time = 0
+       Elapsed-Time = 0
 
        call dhcpv6 {
                # 'Request' expects 'Reply'
-               if (&reply.Packet-Type != Reply) {
+               if (reply.Packet-Type != Reply) {
                        test_fail
                }
 
                test_dhcpv6_reply_matches_request
 
-               # ... Server-ID must be inside &reply
-               if (!&reply.Server-ID.DUID.LLT.Hardware-Type) {
+               # ... Server-ID must be inside reply
+               if (!reply.Server-ID.DUID.LLT.Hardware-Type) {
                        test_fail
                }
 
-               if (!&reply.Server-ID.DUID.LLT.Time) {
+               if (!reply.Server-ID.DUID.LLT.Time) {
                        test_fail
                }
 
-               if (!&reply.Server-ID.DUID.LLT.Hardware-Type.Ethernet.Address) {
+               if (!reply.Server-ID.DUID.LLT.Hardware-Type.Ethernet.Address) {
                        test_fail
                }
        }

diff --git a/src/tests/process/dhcpv6/Solicit b/src/tests/process/dhcpv6/Solicit
index 765a26dc49952979e6b3736c4c88d4a44d88aeb3..ee62de664f19c1949ffb8d5a21762190a1e57819 100644 (file)
--- a/src/tests/process/dhcpv6/Solicit
+++ b/src/tests/process/dhcpv6/Solicit
@@ -1,16 +1,16 @@
 subrequest DHCPv6.Solicit {
-       &Transaction-ID = 0xd81eb8
-       &Client-ID.DUID = LL
-       &Client-ID.DUID.LL.Hardware-Type = Ethernet
-       &Client-ID.DUID.LL.Hardware-Type.Ethernet.Address = 00:01:02:03:04:05
-       &Option-Request = DNS-Servers
-       &Option-Request = AFTR-Name
-       &Elapsed-Time = 0
-       &IA-PD.T1 = 3600
-       &IA-PD.T2 = 5400
+       Transaction-ID = 0xd81eb8
+       Client-ID.DUID = LL
+       Client-ID.DUID.LL.Hardware-Type = Ethernet
+       Client-ID.DUID.LL.Hardware-Type.Ethernet.Address = 00:01:02:03:04:05
+       Option-Request = DNS-Servers
+       Option-Request = AFTR-Name
+       Elapsed-Time = 0
+       IA-PD.T1 = 3600
+       IA-PD.T2 = 5400
 
        call dhcpv6 {
-               if (&reply.Packet-Type != Advertise) {
+               if (reply.Packet-Type != Advertise) {
                        test_fail
                }
 

diff --git a/src/tests/process/dhcpv6/policy.conf b/src/tests/process/dhcpv6/policy.conf
index 5c9b38a750a60ed934ee3c2376ddff02ea76f57a..6ce5aec0c1d5b17c91e252de15c03c4a0f8a4910 100644 (file)
--- a/src/tests/process/dhcpv6/policy.conf
+++ b/src/tests/process/dhcpv6/policy.conf
@@ -1,26 +1,26 @@
 test_dhcpv6_reply_matches_request {
        # We should reply the below attributes...
-       if (!&reply.Transaction-ID) {
+       if (!reply.Transaction-ID) {
                test_fail
        }
 
-       # ... these must be the same as in &request
-       if (&reply.Transaction-ID != &request.Transaction-ID) {
+       # ... these must be the same as in request
+       if (reply.Transaction-ID != request.Transaction-ID) {
                test_fail
        }
 
-       if (&reply.Client-ID.DUID != &request.Client-ID.DUID) {
+       if (reply.Client-ID.DUID != request.Client-ID.DUID) {
                test_fail
        }
 
-       if (&request.Option-Request[*] == DNS-Servers) {
-               if (&reply.DNS-Servers[*] != "2a01:cafe:1") {
+       if (request.Option-Request[*] == DNS-Servers) {
+               if (reply.DNS-Servers[*] != "2a01:cafe:1") {
                        test_fail
                }
        }
 
-       if (&request.Option-Request[*] == AFTR-Name) {
-               if (&reply.AFTR-Name != "tapioca.net") {
+       if (request.Option-Request[*] == AFTR-Name) {
+               if (reply.AFTR-Name != "tapioca.net") {
                        test_fail
                }
        }

diff --git a/src/tests/process/dhcpv6/server.conf b/src/tests/process/dhcpv6/server.conf
index e812b45ab6a2c37989adbfeb17ffead2341135ee..597092d9823f5e6844fe3130acf63eaa4e33f644 100644 (file)
--- a/src/tests/process/dhcpv6/server.conf
+++ b/src/tests/process/dhcpv6/server.conf
@@ -55,18 +55,18 @@ server dhcpv6 {
        }
 
        send Advertise {
-               &reply += {
-                       &IA-PD.T1 = 150
-                       &IA-PD.T2 = 250
+               reply += {
+                       IA-PD.T1 = 150
+                       IA-PD.T2 = 250
 
-                       &IA-PD.Options.IA-PD-Prefix.Preferred-Lifetime = 250
-                       &IA-PD.Options.IA-PD-Prefix.Valid-Lifetime = 300
-                       &IA-PD.Options.IA-PD-Prefix.IPv6-Prefix = 2a00:1:1:100::/56
+                       IA-PD.Options.IA-PD-Prefix.Preferred-Lifetime = 250
+                       IA-PD.Options.IA-PD-Prefix.Valid-Lifetime = 300
+                       IA-PD.Options.IA-PD-Prefix.IPv6-Prefix = 2a00:1:1:100::/56
 
-                       &Preference = 10
+                       Preference = 10
 
-                       &DNS-Servers = 2a01:cafe:1
-                       &AFTR-Name = "tapioca.net"
+                       DNS-Servers = 2a01:cafe:1
+                       AFTR-Name = "tapioca.net"
                }
 
                ok
@@ -77,18 +77,18 @@ server dhcpv6 {
        }
 
        send Reply {
-               &reply += {
-                       &IA-PD.T1 = 150
-                       &IA-PD.T2 = 250
+               reply += {
+                       IA-PD.T1 = 150
+                       IA-PD.T2 = 250
 
-                       &IA-PD.Options.IA-PD-Prefix.Preferred-Lifetime = 250
-                       &IA-PD.Options.IA-PD-Prefix.Valid-Lifetime = 300
-                       &IA-PD.Options.IA-PD-Prefix.IPv6-Prefix = 2a00:1:1:100::/56
+                       IA-PD.Options.IA-PD-Prefix.Preferred-Lifetime = 250
+                       IA-PD.Options.IA-PD-Prefix.Valid-Lifetime = 300
+                       IA-PD.Options.IA-PD-Prefix.IPv6-Prefix = 2a00:1:1:100::/56
 
-                       &Preference = 10
+                       Preference = 10
 
-                       &DNS-Servers = 2a01:cafe:1
-                       &AFTR-Name = "tapioca.net"
+                       DNS-Servers = 2a01:cafe:1
+                       AFTR-Name = "tapioca.net"
                }
        }
 }

diff --git a/src/tests/process/policy.conf b/src/tests/process/policy.conf
index 7075af68849a9ac1cb01705ccbe9af3518be65fd..efb46de0d5449ed8c24cb451fd11638d3475c185 100644 (file)
--- a/src/tests/process/policy.conf
+++ b/src/tests/process/policy.conf
@@ -9,21 +9,21 @@
 #  Outputs the contents of the control list in debugging (-X) mode
 #
 debug_control {
-       %debug_attr(&control.[*])
+       %debug_attr(control.[*])
 }
 
 #
 #  Outputs the contents of the request list in debugging (-X) mode
 #
 debug_request {
-       %debug_attr(&request.[*])
+       %debug_attr(request.[*])
 }
 
 #
 #  Outputs the contents of the reply list in debugging (-X) mode
 #
 debug_reply {
-       %debug_attr(&reply.[*])
+       %debug_attr(reply.[*])
 }
 
 #
@@ -39,19 +39,19 @@ debug_all {
 #  Set the test to successful, but only if there are no failures.
 #
 success {
-       &reply.Result-Status = "success"
+       reply.Result-Status = "success"
 
        ok
 }
 
 test_fail {
-       &reply += {
-               &Failure = "Failure in test file %interpreter(....filename)[%interpreter(...line)]"
+       reply += {
+               Failure = "Failure in test file %interpreter(....filename)[%interpreter(...line)]"
        }
 
-       if (&parent.request) {
-               &parent.reply += {
-                       &Failure = "Failure in test file %interpreter(....filename)[%interpreter(...line)]"
+       if (parent.request) {
+               parent.reply += {
+                       Failure = "Failure in test file %interpreter(....filename)[%interpreter(...line)]"
                }
        }
 }

diff --git a/src/tests/process/radius/access_accept b/src/tests/process/radius/access_accept
index 5c99e4f029bcfbf5bd7d0861ccf0a73ec7364bfb..80a0d190b956a151d8f6925a13298cb95d5ea684 100644 (file)
--- a/src/tests/process/radius/access_accept
+++ b/src/tests/process/radius/access_accept
@@ -1,10 +1,10 @@
 subrequest RADIUS.Access-Request {
-       &User-Name = "bob"
-       &User-Password = "hello"
+       User-Name = "bob"
+       User-Password = "hello"
 
 
        call radius {
-               if (&reply.Packet-Type != Access-Accept) {
+               if (reply.Packet-Type != Access-Accept) {
                        test_fail
                }
        }

diff --git a/src/tests/process/radius/policy.conf b/src/tests/process/radius/policy.conf
index f587e21641112a54868015ceefa21dd1f30b2989..99fbdf9df142f15b5f8511e77b42ac362824d2af 100644 (file)
--- a/src/tests/process/radius/policy.conf
+++ b/src/tests/process/radius/policy.conf
@@ -2,7 +2,7 @@
 #  Send Access-Accept immediately
 #
 accept {
-       &reply.Packet-Type := Access-Accept
+       reply.Packet-Type := Access-Accept
 
        handled
 }
@@ -11,7 +11,7 @@ accept {
 #  Send Access-Challenge immediately
 #
 challenge {
-       &reply.Packet-Type := Access-Challenge
+       reply.Packet-Type := Access-Challenge
 
        handled
 }

diff --git a/src/tests/process/radius/proxy_state b/src/tests/process/radius/proxy_state
index 6a463c3dfa4b35d20452cdc222fef4120e71d325..2b371929f050442013aa0c4b5c583d3ea8317993 100644 (file)
--- a/src/tests/process/radius/proxy_state
+++ b/src/tests/process/radius/proxy_state
@@ -2,17 +2,17 @@
 #  No proxy-state attributes
 #
 subrequest RADIUS.Access-Request {
-       &User-Name = "bob"
-       &User-Password = "hello"
+       User-Name = "bob"
+       User-Password = "hello"
 
        call radius {}
 
-       if (!(&reply.Packet-Type == Access-Accept)) {
+       if (!(reply.Packet-Type == Access-Accept)) {
                test_fail
        }
 
        # We shouldn't magically acquire new proxy state values
-       if (&reply.Proxy-State) {
+       if (reply.Proxy-State) {
                test_fail
        }
 }
@@ -21,21 +21,21 @@ subrequest RADIUS.Access-Request {
 #  One proxy state-attribute
 #
 subrequest RADIUS.Access-Request {
-       &User-Name = "bob"
-       &User-Password = "hello"
-       &Proxy-State := { 0x01 }
+       User-Name = "bob"
+       User-Password = "hello"
+       Proxy-State := { 0x01 }
 
        call radius {}
 
-       if (!(&reply.Packet-Type == Access-Accept)) {
+       if (!(reply.Packet-Type == Access-Accept)) {
                test_fail
        }
 
-       if (!(&reply.Proxy-State[0] == 0x01)) {
+       if (!(reply.Proxy-State[0] == 0x01)) {
                test_fail
        }
 
-       if (&reply.Proxy-State[1]) {
+       if (reply.Proxy-State[1]) {
                test_fail
        }
 }
@@ -44,25 +44,25 @@ subrequest RADIUS.Access-Request {
 #  Two proxy state-attributes
 #
 subrequest RADIUS.Access-Request {
-       &User-Name = "bob"
-       &User-Password = "hello"
-       &Proxy-State := { 0x01, 0x02 }
+       User-Name = "bob"
+       User-Password = "hello"
+       Proxy-State := { 0x01, 0x02 }
 
        call radius {}
 
-       if (!(&reply.Packet-Type == Access-Accept)) {
+       if (!(reply.Packet-Type == Access-Accept)) {
                test_fail
        }
 
-       if (!(&reply.Proxy-State[0] == 0x01)) {
+       if (!(reply.Proxy-State[0] == 0x01)) {
                test_fail
        }
 
-       if (!(&reply.Proxy-State[1] == 0x02)) {
+       if (!(reply.Proxy-State[1] == 0x02)) {
                test_fail
        }
 
-       if (&reply.Proxy-State[2]) {
+       if (reply.Proxy-State[2]) {
                test_fail
        }
 }

diff --git a/src/tests/process/radius/server.conf b/src/tests/process/radius/server.conf
index f705d2c6a65a720f68e411bf572fd4b5ffaf8a33..742aadac2b0002954ec5167adaf49a41452cb56f 100644 (file)
--- a/src/tests/process/radius/server.conf
+++ b/src/tests/process/radius/server.conf
@@ -15,6 +15,6 @@ server radius {
        }
 
        send Access-Challenge {
-               &reply.Reply-Message := "challenge"
+               reply.Reply-Message := "challenge"
        }
 }

diff --git a/src/tests/radclient/coa/README.md b/src/tests/radclient/coa/README.md
index 33d546111d749199520b561677a7d58948b701f9..9a33a2c321ad9ce9c62862b96a48291f6b0f91b1 100644 (file)
--- a/src/tests/radclient/coa/README.md
+++ b/src/tests/radclient/coa/README.md
@@ -6,8 +6,8 @@ Edit `raddb/sites-enabled/default`, and change the `recv Access-Request` section
 
 ```
 recv Access-Request {
-    if (&User-Name == "coa") {
-        &Reply-Message := %exec('./build/make/jlibtool', '--mode=execute', './build/bin/local/radclient', '-d', 'raddb/', '-D', 'share/dictionary/', '-xx', '-t', '2', '-F', '-f', 'src/tests/radclient/coa/server_coa.txt,src/tests/radclient/exec/server_coa_reply.txt', 'localhost:37990', 'coa', 'testing123')
+    if (User-Name == "coa") {
+        Reply-Message := %exec('./build/make/jlibtool', '--mode=execute', './build/bin/local/radclient', '-d', 'raddb/', '-D', 'share/dictionary/', '-xx', '-t', '2', '-F', '-f', 'src/tests/radclient/coa/server_coa.txt,src/tests/radclient/exec/server_coa_reply.txt', 'localhost:37990', 'coa', 'testing123')
         accept
     }
     ...

diff --git a/src/tests/radclient/config/radiusd.conf b/src/tests/radclient/config/radiusd.conf
index 299b939229a2c7a6a283ee5a08bf3caf382e0612..bc71e664dcf106436fdf42f4db3a631e0bca2ec0 100644 (file)
--- a/src/tests/radclient/config/radiusd.conf
+++ b/src/tests/radclient/config/radiusd.conf
@@ -31,8 +31,8 @@ security {
 
 policy {
        files.authorize {
-               if (&User-Name == "bob") {
-                       &control.Password.Cleartext := "bob"
+               if (User-Name == "bob") {
+                       control.Password.Cleartext := "bob"
                }
        }
        $INCLUDE ${maindir}/policy.d/
@@ -131,10 +131,10 @@ server test {
         }
 
         new client {
-                &control.FreeRADIUS-Client-IP-Address := 127.0.0.1
-                &control.FreeRADIUS-Client-Secret := 'testing123'
-                &control.FreeRADIUS-Client-Shortname := 'test-client'
-                &control.FreeRADIUS-Client-NAS-Type := 'test'
+                control.FreeRADIUS-Client-IP-Address := 127.0.0.1
+                control.FreeRADIUS-Client-Secret := 'testing123'
+                control.FreeRADIUS-Client-Shortname := 'test-client'
+                control.FreeRADIUS-Client-NAS-Type := 'test'
                ok
         }
 
@@ -150,17 +150,17 @@ server test {
                #
                #  Ensure that we can send unknown attributes back.
                #
-               if (&NAS-Identifier == "auth_4") {
-                       &reply.Class := 0x483d342c493d34
-                       &reply += {
-                               &raw.26 = &reply.Class
-                               &raw.26 = 0x483d342c493d43
+               if (NAS-Identifier == "auth_4") {
+                       reply.Class := 0x483d342c493d34
+                       reply += {
+                               raw.26 = reply.Class
+                               raw.26 = 0x483d342c493d43
                        }
                }
 
-               if (&User-Name == "proxy") {
-                       if (!&Proxy-State) {
-                               &control.Auth-Type := ::proxy
+               if (User-Name == "proxy") {
+                       if (!Proxy-State) {
+                               control.Auth-Type := ::proxy
                                return
                        }
 
@@ -168,12 +168,12 @@ server test {
                        return
                }
 
-               if ((&NAS-Identifier == "dynamic") && !&Proxy-State) {
-                       &control.Auth-Type := ::dynamic-proxy
+               if ((NAS-Identifier == "dynamic") && !Proxy-State) {
+                       control.Auth-Type := ::dynamic-proxy
                        return
                }
 
-               if (&User-Name == "bob") {
+               if (User-Name == "bob") {
                        accept
                } else {
                        reject
@@ -186,13 +186,13 @@ server test {
        }
 
        authenticate dynamic-proxy {
-               &reply.NAS-Port := %proxy.sendto.ipaddr(127.0.0.1, $ENV{TEST_PORT}, 'testing123')
+               reply.NAS-Port := %proxy.sendto.ipaddr(127.0.0.1, $ENV{TEST_PORT}, 'testing123')
                ok
        }
 
        send Access-Accept {
-               if (&Proxy-State) {
-                       &reply.Reply-Message := "Have Proxy-State"
+               if (Proxy-State) {
+                       reply.Reply-Message := "Have Proxy-State"
                }
        }
 

diff --git a/src/tests/tacacs/config/radiusd.conf b/src/tests/tacacs/config/radiusd.conf
index aafe4ecfbbca6221dbe3908586f45a091f29d556..6d389ef88da2c0a9ca6394a1e2b2d069ba45277d 100644 (file)
--- a/src/tests/tacacs/config/radiusd.conf
+++ b/src/tests/tacacs/config/radiusd.conf
@@ -31,8 +31,8 @@ security {
 
 policy {
        files.authorize {
-               if (&User-Name == "bob") {
-                       &control.Password.Cleartext := "bob"
+               if (User-Name == "bob") {
+                       control.Password.Cleartext := "bob"
                }
        }
        $INCLUDE ${maindir}/policy.d/
@@ -109,47 +109,47 @@ server test {
        }
 
        authenticate PAP {
-               if (&User-Name == 'tapioca') {
-                       &control.Password.Cleartext := 'queijo'
+               if (User-Name == 'tapioca') {
+                       control.Password.Cleartext := 'queijo'
                }
 
                pap { fail = 1, reject = 2 }
 
                if (ok) {
-                       &reply.Server-Message := "Authentication-Start accepted"
+                       reply.Server-Message := "Authentication-Start accepted"
                } else {
-                       &reply.Server-Message := "Authentication-Start failed for %{User-Name}"
+                       reply.Server-Message := "Authentication-Start failed for %{User-Name}"
                }
        }
 
        authenticate ASCII {
-               if (&User-Name == 'tapioca' && &User-Password == 'queijo') {
-                       &reply.Server-Message := "ASCII authentication accepted"
+               if (User-Name == 'tapioca' && User-Password == 'queijo') {
+                       reply.Server-Message := "ASCII authentication accepted"
                        ok
                } else {
-                       &reply.Server-Message := "ASCII authentication failed for %{User-Name}"
+                       reply.Server-Message := "ASCII authentication failed for %{User-Name}"
                        reject
                }
        }
 
        authenticate CHAP {
-               if (&User-Name == 'tapioca') {
-                       &control.Password.Cleartext = 'queijo'
+               if (User-Name == 'tapioca') {
+                       control.Password.Cleartext = 'queijo'
                }
                chap { fail = 1, reject = 2 }
                if (ok) {
-                       &reply.Server-Message := "CHAP authentication accepted"
+                       reply.Server-Message := "CHAP authentication accepted"
                } else {
-                       &reply.Server-Message := "CHAP authentication failed for %{User-Name}"
+                       reply.Server-Message := "CHAP authentication failed for %{User-Name}"
                }
        }
 
        send Authentication-Pass {
-               &reply.Data := "Authentication-Data"
+               reply.Data := "Authentication-Data"
        }
 
        send Authentication-Fail {
-               &reply.Data := "Authentication-Data"
+               reply.Data := "Authentication-Data"
        }
 
        recv Authentication-Continue {
@@ -157,14 +157,14 @@ server test {
        }
 
        recv Authorization-Request {
-               if (&User-Name == "tapioca") {
-                       &reply.Authorization-Status := ::Pass-Add
-                       &reply.Server-Message := "Authorization-Request accepted"
+               if (User-Name == "tapioca") {
+                       reply.Authorization-Status := ::Pass-Add
+                       reply.Server-Message := "Authorization-Request accepted"
 
-                       &control.Auth-Type := ::Accept
+                       control.Auth-Type := ::Accept
 
                } else {
-                       &reply.Server-Message := "Authorization-Request failed for %{User-Name}"
+                       reply.Server-Message := "Authorization-Request failed for %{User-Name}"
                        reject
                }
        }
@@ -181,24 +181,24 @@ server test {
 
        #       First packet for a session
        accounting Start {
-               &reply.Server-Message := "Accounting-Start Section"
+               reply.Server-Message := "Accounting-Start Section"
                ok
        }
 
        #       Updates a session
        accounting Watchdog {
-               &reply.Server-Message := "Accounting-Watchdog Section"
+               reply.Server-Message := "Accounting-Watchdog Section"
                ok
        }
 
        #       Stops a session
        accounting Stop {
-               &reply.Server-Message := "Accounting-Stop Section"
+               reply.Server-Message := "Accounting-Stop Section"
                ok
        }
 
        send Accounting-Success {
-               &reply.Accounting-Status := ::Success
-               &reply.Data := 0x12
+               reply.Accounting-Status := ::Success
+               reply.Data := 0x12
        }
 }

diff --git a/src/tests/unit/condition/escape.txt.ignore b/src/tests/unit/condition/escape.txt.ignore
deleted file mode 100644 (file)
index fb0dd53..0000000
--- a/src/tests/unit/condition/escape.txt.ignore
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#  Like the conditional tests, but tests for escape sequences
-#
-
-#
-#  These tests also involve run-time purification, and we don't
-#  do that with the new conditions.  So it's disabled for now.
-#
-condition "bob" == 0x626f62
-match true
-
-# \n gets escaped in double quoted strings
-condition "\n" == 0x0a
-match true
-
-# but not in single quoted strings
-condition '\n' == 0x5c6e
-match true
-
-condition '\'' == 0x27
-match true
-
-condition "'" == 0x27
-match true
-
-condition "\"" == 0x22
-match true
-
-condition 0x22 == '"'
-match true
-
-condition '\'' == "'"
-match true
-
-condition '\\' == "\\"
-match true
-
-#
-#  The first string is \ + x
-#
-condition '\x' == "x"
-match false
-
-# embedded zeros are OK
-condition "a\000a" == 0x610061
-match true
-
-condition "aa\000" == 0x616100
-match true
-
-condition 'aa\000' == 0x61615c303030
-match true
-
-condition 'aa\000' == "aa\000"
-match false
-
-condition 'a\n' == "a\n"
-match false
-
-condition  0x626f62 == 'bob'
-match true
-
-condition  0x626f62 == "bob"
-match true
-
-condition  0x626f62 == bob
-match true
-
-condition  \n == 0x5c6e
-match ERROR offset 1: No operand found.  Expected &ref, literal, 'quoted literal', "%{expansion}", or enum value
-
-condition  a\n == 0x615c6e
-match ERROR offset 2: Unexpected text after enum value.  Expected operator
-
-count
-match 40