From: Alan T. DeKok Date: Thu, 1 Sep 2022 22:13:39 +0000 (-0400) Subject: more cleanups X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a0e8dad94e5dceab425fa1279c50710a797b145;p=thirdparty%2Ffreeradius-server.git more cleanups perl -p -i -e 's/&request\./&/' src/tests/keywords/* except for "comments", because &Reply-Message is likely parsed as &Reply - &Message. We'll have to track that down again --- diff --git a/src/tests/keywords/3gpp b/src/tests/keywords/3gpp index b70b7b53d55..becd900abff 100644 --- a/src/tests/keywords/3gpp +++ b/src/tests/keywords/3gpp @@ -1,10 +1,10 @@ -&request.Vendor-Specific.3GPP.IMSI := "hello" +&Vendor-Specific.3GPP.IMSI := "hello" # # "request.[0-9]" should be parsed as a list followed # by an attribute. # &control.Tmp-String-0 := &Vendor-Specific.3GPP.IMSI -&control.Tmp-String-1 := &request.Vendor-Specific.3GPP.IMSI +&control.Tmp-String-1 := &Vendor-Specific.3GPP.IMSI success diff --git a/src/tests/keywords/case-empty-string b/src/tests/keywords/case-empty-string index 209697abdf3..9f93b024caa 100644 --- a/src/tests/keywords/case-empty-string +++ b/src/tests/keywords/case-empty-string @@ -1,6 +1,6 @@ # PRE: switch # -&request.Filter-Id := "" +&Filter-Id := "" switch &Filter-Id { case "" { diff --git a/src/tests/keywords/cast-byte b/src/tests/keywords/cast-byte index 496b854c593..119e124ccc4 100644 --- a/src/tests/keywords/cast-byte +++ b/src/tests/keywords/cast-byte @@ -1,7 +1,7 @@ # # PRE: if # -&request.Class := 0xad +&Class := 0xad if (&Class == 173) { success diff --git a/src/tests/keywords/cast-integer b/src/tests/keywords/cast-integer index 9b111f94db9..e3081bcd7e5 100644 --- a/src/tests/keywords/cast-integer +++ b/src/tests/keywords/cast-integer @@ -1,7 +1,7 @@ # # PRE: if # -&request.Class := 0x00000101 +&Class := 0x00000101 if (&Class[0] == 257) { success diff --git a/src/tests/keywords/cast-ipaddr b/src/tests/keywords/cast-ipaddr index 15609733b72..c17c0ef339a 100644 --- a/src/tests/keywords/cast-ipaddr +++ b/src/tests/keywords/cast-ipaddr @@ -1,7 +1,7 @@ # # PRE: if redundant # -&request.NAS-IP-Address := 127.0.0.1 +&NAS-IP-Address := 127.0.0.1 &Tmp-Integer-0 := 0x7f000001 &Tmp-String-0 := &NAS-IP-Address diff --git a/src/tests/keywords/cast-short b/src/tests/keywords/cast-short index c7c0bee88c4..f4ff7629aa3 100644 --- a/src/tests/keywords/cast-short +++ b/src/tests/keywords/cast-short @@ -1,7 +1,7 @@ # # PRE: if # -&request.Class := 0x0101 +&Class := 0x0101 if (&Class == 257) { success diff --git a/src/tests/keywords/cmp b/src/tests/keywords/cmp index df1daa95df9..8ce2d0047ab 100644 --- a/src/tests/keywords/cmp +++ b/src/tests/keywords/cmp @@ -1,5 +1,5 @@ -&request.Called-Station-Id := "This is a test" -&request.Calling-Station-Id := "This is a test" +&Called-Station-Id := "This is a test" +&Calling-Station-Id := "This is a test" # # Check attribute references diff --git a/src/tests/keywords/edit-leaf-multivalue b/src/tests/keywords/edit-leaf-multivalue index a67efad2752..617c05d8202 100644 --- a/src/tests/keywords/edit-leaf-multivalue +++ b/src/tests/keywords/edit-leaf-multivalue @@ -5,7 +5,7 @@ "foo", "bar", "baz", - &request.User-Name + &User-Name } if (%{request.Tmp-String-0[#]} != 4) { diff --git a/src/tests/keywords/foreach-break b/src/tests/keywords/foreach-break index 784da75179b..200add83ecf 100644 --- a/src/tests/keywords/foreach-break +++ b/src/tests/keywords/foreach-break @@ -31,7 +31,7 @@ foreach &Filter-Id { &Filter-Id = "2" } -foreach &request.Reply-Message { +foreach &Reply-Message { if ("%{Foreach-Variable-0}" == "1") { &request += { &Filter-Id = "3" @@ -51,7 +51,7 @@ foreach &request.Reply-Message { &Filter-Id = "2" } -foreach &request.Reply-Message { +foreach &Reply-Message { if ("%{Foreach-Variable-0}" == "1") { &request += { &Filter-Id = "3" diff --git a/src/tests/keywords/foreach-break-3 b/src/tests/keywords/foreach-break-3 index b3a7b43c212..9ed231f5096 100644 --- a/src/tests/keywords/foreach-break-3 +++ b/src/tests/keywords/foreach-break-3 @@ -6,7 +6,7 @@ &control.Calling-Station-Id := { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "g" } foreach &control.Calling-Station-Id { - if (&request.Calling-Station-Id == "%{Foreach-Variable-0}") { + if (&Calling-Station-Id == "%{Foreach-Variable-0}") { success break } diff --git a/src/tests/keywords/foreach-return b/src/tests/keywords/foreach-return index 11b4e035c81..95c98ba6aaf 100644 --- a/src/tests/keywords/foreach-return +++ b/src/tests/keywords/foreach-return @@ -4,7 +4,7 @@ # # Adding attribute during request and immediately returning should still work # -&request.Filter-Id := { "1", "2", "3", "4", "5" } +&Filter-Id := { "1", "2", "3", "4", "5" } foreach &Filter-Id { if ("%{Foreach-Variable-0}" == "3") { diff --git a/src/tests/keywords/map-xlat b/src/tests/keywords/map-xlat index 0cb53f48dfe..126db42f325 100644 --- a/src/tests/keywords/map-xlat +++ b/src/tests/keywords/map-xlat @@ -23,11 +23,11 @@ foreach &Tmp-String-1[*] { } } -if (&request.Vendor-Specific.Nokia-SR.MSAP-Interface[0] != 'UNICAST_7360OLT3') { +if (&Vendor-Specific.Nokia-SR.MSAP-Interface[0] != 'UNICAST_7360OLT3') { test_fail } -if (&request.Vendor-Specific.Nokia-SR.MSAP-Interface[1] != 'UNICAST_7360OLT4') { +if (&Vendor-Specific.Nokia-SR.MSAP-Interface[1] != 'UNICAST_7360OLT4') { test_fail } diff --git a/src/tests/keywords/module-failure-message b/src/tests/keywords/module-failure-message index c528e876b63..597adbd9d36 100644 --- a/src/tests/keywords/module-failure-message +++ b/src/tests/keywords/module-failure-message @@ -4,23 +4,23 @@ test -if (&request.Module-Failure-Message[4] != 'test: RERROR error message') { +if (&Module-Failure-Message[4] != 'test: RERROR error message') { test_fail } -if (&request.Module-Failure-Message[3] != 'test: RDEBUG error message') { +if (&Module-Failure-Message[3] != 'test: RDEBUG error message') { test_fail } -if (&request.Module-Failure-Message[2] != 'test: RDEBUG2 error message') { +if (&Module-Failure-Message[2] != 'test: RDEBUG2 error message') { test_fail } -if (&request.Module-Failure-Message[1] != 'test: RDEBUG3 error message') { +if (&Module-Failure-Message[1] != 'test: RDEBUG3 error message') { test_fail } -if (&request.Module-Failure-Message[0] != 'test: RDEBUG4 error message') { +if (&Module-Failure-Message[0] != 'test: RDEBUG4 error message') { test_fail } diff --git a/src/tests/keywords/smash b/src/tests/keywords/smash index 703692dfdde..3b79a13d098 100644 --- a/src/tests/keywords/smash +++ b/src/tests/keywords/smash @@ -3,6 +3,6 @@ # # This gives the game away. # -update { &control.User-Name := 'bob', &request.Reply-Message := "foo" } +update { &control.User-Name := 'bob', &Reply-Message := "foo" } success diff --git a/src/tests/keywords/subrequest-if b/src/tests/keywords/subrequest-if index 489fde7d4c9..557407066dc 100644 --- a/src/tests/keywords/subrequest-if +++ b/src/tests/keywords/subrequest-if @@ -2,7 +2,7 @@ # PRE: subrequest # subrequest Access-Request { - &request.User-Name := &parent.request.User-Name + &User-Name := &parent.request.User-Name if (!&User-Name) { test_fail diff --git a/src/tests/keywords/unknown b/src/tests/keywords/unknown index edd40f54e1a..94ade08f031 100644 --- a/src/tests/keywords/unknown +++ b/src/tests/keywords/unknown @@ -8,7 +8,7 @@ update request { # # Check that a known but malformed attr is malformed # -&request.26.24757.84.9.5.7 := 0xab +&26.24757.84.9.5.7 := 0xab if (&26.24757.84.9.5.7 != 0xab) { test_fail @@ -17,7 +17,7 @@ if (&26.24757.84.9.5.7 != 0xab) { # # Check that an unknown attr is OK # -&request.26.24757.84.9.5.15 := 0xabcdef +&26.24757.84.9.5.15 := 0xabcdef if (&26.24757.84.9.5.15 != 0xabcdef) { test_fail @@ -35,7 +35,7 @@ if (&26.11344.1 != 127.0.0.2) { test_fail } -&request.26.11344.1 := 0x7f000001 +&26.11344.1 := 0x7f000001 if (&Vendor-Specific.FreeRADIUS.Proxied-To == 127.0.0.2) { test_fail @@ -53,7 +53,7 @@ if (&26.11344.1 != 127.0.0.1) { test_fail } -&request.26.66.1 = 0x01020304 +&26.66.1 = 0x01020304 if (&26.66.1 != 0x01020304) { test_fail