From: nolade Date: Thu, 13 Mar 2025 15:46:20 +0000 (-0400) Subject: Remove & from &control attribute X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fee0bb7fbf0c0e202cbddd3849052c8c3235fa6;p=thirdparty%2Ffreeradius-server.git Remove & from &control attribute perl -p -i -e 's/\&control/control/g' $(git grep -lE '&[a-zA-Z0-9]' doc/antora | egrep -v 'raddb|developers|interpreter|assets') --- diff --git a/doc/antora/modules/howto/pages/eduroam_config.adoc b/doc/antora/modules/howto/pages/eduroam_config.adoc index 2e5d96906f4..9444d265d76 100644 --- a/doc/antora/modules/howto/pages/eduroam_config.adoc +++ b/doc/antora/modules/howto/pages/eduroam_config.adoc @@ -169,7 +169,7 @@ server eduroam { Tunnel-Type := VLAN Tunnel-Medium-Type := IEEE-802 } - if (&control:Proxy-To-Realm) { + if (control:Proxy-To-Realm) { update reply { Tunnel-Private-Group-ID = ${eduroam_default_guest_vlan} } diff --git a/doc/antora/modules/howto/pages/installation/upgrade.adoc b/doc/antora/modules/howto/pages/installation/upgrade.adoc index 979f6375d3a..2d0fefb5d17 100644 --- a/doc/antora/modules/howto/pages/installation/upgrade.adoc +++ b/doc/antora/modules/howto/pages/installation/upgrade.adoc @@ -990,8 +990,8 @@ key = User-Name In v4 they must now be specified as:: ``` -counter_name = &control.Daily-Session-Time -check_name = &control.Max-Daily-Session +counter_name = control.Daily-Session-Time +check_name = control.Max-Daily-Session reply_name = reply.Session-Timeout key = "%{Stripped-User-Name || &User-Name}" ``` diff --git a/doc/antora/modules/howto/pages/modules/chap/index.adoc b/doc/antora/modules/howto/pages/modules/chap/index.adoc index 0baec65cda2..c59739ee6b7 100644 --- a/doc/antora/modules/howto/pages/modules/chap/index.adoc +++ b/doc/antora/modules/howto/pages/modules/chap/index.adoc @@ -81,7 +81,7 @@ containing `ERROR` or `WARNING`, or the `chap` module name. (0) chap - Setting control.Auth-Type = chap (0) chap (ok) ... -(0) Found "known good" password in &control.Password.Cleartext +(0) Found "known good" password in control.Password.Cleartext (0) Running 'authenticate chap' from file ./raddb/sites-enabled/default (0) authenticate chap { (0) chap - Comparing with "known good" Password.Cleartext diff --git a/doc/antora/modules/howto/pages/modules/ldap/authentication.adoc b/doc/antora/modules/howto/pages/modules/ldap/authentication.adoc index c10e3f37534..462b39c1702 100644 --- a/doc/antora/modules/howto/pages/modules/ldap/authentication.adoc +++ b/doc/antora/modules/howto/pages/modules/ldap/authentication.adoc @@ -44,8 +44,8 @@ On the FreeRADIUS debug terminal side, you should see something like: (0) ldap (updated) ... (0) pap - No {...} in &Password.With-Header, re-writing to Password.Cleartext -(0) pap - Normalized &control.Password.With-Header -> &control.Password.Cleartext -(0) pap - Removing &control.Password.With-Header +(0) pap - Normalized control.Password.With-Header -> control.Password.Cleartext +(0) pap - Removing control.Password.With-Header (0) pap - Setting control.Auth-Type = pap (0) pap (updated) (0) } # recv Access-Request (updated) diff --git a/doc/antora/modules/howto/pages/modules/ldap_authentication_testing.adoc b/doc/antora/modules/howto/pages/modules/ldap_authentication_testing.adoc index 3a5e5af31af..2ec362891da 100644 --- a/doc/antora/modules/howto/pages/modules/ldap_authentication_testing.adoc +++ b/doc/antora/modules/howto/pages/modules/ldap_authentication_testing.adoc @@ -40,8 +40,8 @@ On the FreeRADIUS debug terminal side, you should see something like: (0) ldap (updated) ... (0) pap - No {...} in &Password-With-Header, re-writing to Cleartext-Password -(0) pap - Normalized &control:Password-With-Header -> &control:Cleartext-Password -(0) pap - Removing &control:Password-With-Header +(0) pap - Normalized control:Password-With-Header -> control:Cleartext-Password +(0) pap - Removing control:Password-With-Header (0) pap - Setting control:Auth-Type = pap (0) pap (updated) (0) } # recv Access-Request (updated) diff --git a/doc/antora/modules/reference/pages/type/cast.adoc b/doc/antora/modules/reference/pages/type/cast.adoc index a64876bd5da..bccc06947ee 100644 --- a/doc/antora/modules/reference/pages/type/cast.adoc +++ b/doc/antora/modules/reference/pages/type/cast.adoc @@ -137,7 +137,7 @@ reply. ---- control.Reply-Message := { "one", "two" } -reply.Reply-Message := &control.Reply-Message[*] +reply.Reply-Message := control.Reply-Message[*] ---- The following example will take an input string `"192.168.0.1"`, split diff --git a/doc/antora/modules/reference/pages/xlat/builtin.adoc b/doc/antora/modules/reference/pages/xlat/builtin.adoc index ee52830d484..762b616ee30 100644 --- a/doc/antora/modules/reference/pages/xlat/builtin.adoc +++ b/doc/antora/modules/reference/pages/xlat/builtin.adoc @@ -25,8 +25,8 @@ Tmp-String-0 := "Caipirinha" Framed-IP-Address := 192.0.2.1 reply += { - Reply-Message = "The length of %{control.Tmp-String-0} is %length(&control.Tmp-String-0)" - Reply-Message = "The length of %{control.Framed-IP-Address} is %length(&control.Framed-IP-Address)" + Reply-Message = "The length of %{control.Tmp-String-0} is %length(control.Tmp-String-0)" + Reply-Message = "The length of %{control.Framed-IP-Address} is %length(control.Framed-IP-Address)" } ---- diff --git a/doc/antora/modules/reference/pages/xlat/concat.adoc b/doc/antora/modules/reference/pages/xlat/concat.adoc index b4666cb5602..7db4055bc25 100644 --- a/doc/antora/modules/reference/pages/xlat/concat.adoc +++ b/doc/antora/modules/reference/pages/xlat/concat.adoc @@ -39,7 +39,7 @@ string foo foo += { "a", "c", "c", "d" } # abcd -foo += &control.Tmp-String-0[*] +foo += control.Tmp-String-0[*] ---- // Copyright (C) 2023 Network RADIUS SAS. Licenced under CC-by-NC 4.0. diff --git a/doc/antora/modules/reference/pages/xlat/dict.adoc b/doc/antora/modules/reference/pages/xlat/dict.adoc index b0770e28c38..ca51f04d7b2 100644 --- a/doc/antora/modules/reference/pages/xlat/dict.adoc +++ b/doc/antora/modules/reference/pages/xlat/dict.adoc @@ -44,7 +44,7 @@ string foo foo += { "a", "c", "c", "d" } # abcd -foo += &control.Tmp-String-0[*] +foo += control.Tmp-String-0[*] ---- == %explode(<&ref>, ) @@ -61,7 +61,7 @@ This expansion is the opposite of `%concat( ... )`. ---- control.Tmp-String-0 := "bob.toba@domain.com" -control.Tmp-String-1 := "%explode(&control.Tmp-String-0, '@')" +control.Tmp-String-1 := "%explode(control.Tmp-String-0, '@')" reply.Reply-Message := "Welcome %{control.Tmp-String-1[0]}" ---- @@ -125,7 +125,7 @@ Serialize attributes as comma-delimited string. [source,unlang] ---- control.Tmp-String-0 := { "This is a string", "This is another one" } -reply.Reply-Message := "Serialize output: %pairs(&control.[*])" +reply.Reply-Message := "Serialize output: %pairs(control.[*])" ---- .Output diff --git a/doc/antora/modules/reference/pages/xlat/explode.adoc b/doc/antora/modules/reference/pages/xlat/explode.adoc index 8e48c55c35a..b79167966f5 100644 --- a/doc/antora/modules/reference/pages/xlat/explode.adoc +++ b/doc/antora/modules/reference/pages/xlat/explode.adoc @@ -12,7 +12,7 @@ This expansion is the inverse of xref:xlat/concat.adoc[concat]. ---- control.Tmp-String-0 := "bob.toba@domain.com" -control.Tmp-String-1 := "%explode(&control.Tmp-String-0, '@')" +control.Tmp-String-1 := "%explode(control.Tmp-String-0, '@')" reply.Reply-Message := "Welcome %{control.Tmp-String-1[0]}" ---- diff --git a/doc/antora/modules/reference/pages/xlat/pairs.adoc b/doc/antora/modules/reference/pages/xlat/pairs.adoc index 87bebe5e095..e87893a0bd4 100644 --- a/doc/antora/modules/reference/pages/xlat/pairs.adoc +++ b/doc/antora/modules/reference/pages/xlat/pairs.adoc @@ -11,7 +11,7 @@ Note that there is no "convert string to pairs" function. Instead, you can simp [source,unlang] ---- control.Tmp-String-0 := { "This is a string", "This is another one" } -reply.Reply-Message := "Serialize output: %pairs(&control.[*])" +reply.Reply-Message := "Serialize output: %pairs(control.[*])" ---- .Output diff --git a/doc/antora/modules/tutorials/pages/final_group_project.adoc b/doc/antora/modules/tutorials/pages/final_group_project.adoc index a5f7fad349d..a65852298f6 100644 --- a/doc/antora/modules/tutorials/pages/final_group_project.adoc +++ b/doc/antora/modules/tutorials/pages/final_group_project.adoc @@ -165,7 +165,7 @@ modules being called, when we know the request will be handled by a remote proxy [source,unlang] ---- suffix -if (&control.Proxy-To-Realm) { +if (control.Proxy-To-Realm) { return } ----