From: nolade Date: Thu, 13 Mar 2025 15:03:26 +0000 (-0400) Subject: Remove & where &foo = bar & X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60357a0303635d6e4cb2b17ab55d18af4d804be9;p=thirdparty%2Ffreeradius-server.git Remove & where &foo = bar & perl -p -i -e 's/&([^\s]+\s+(=|.=))/$1/g' $(git grep -lE '^&|[^&]&[a-zA-Z]' doc/antora/modules | egrep -v 'raddb|developers|interpreter.adoc|assets') --- diff --git a/doc/antora/modules/howto/pages/eduroam_config.adoc b/doc/antora/modules/howto/pages/eduroam_config.adoc index 6017cff8c0b..2e5d96906f4 100644 --- a/doc/antora/modules/howto/pages/eduroam_config.adoc +++ b/doc/antora/modules/howto/pages/eduroam_config.adoc @@ -121,7 +121,7 @@ server eduroam { # You can make this condition as complex as you like, to # include additional subdomains just concatenate the conditions # with &&. - if (&Stripped-User-Domain != "${operator_name}") { + if (Stripped-User-Domain != "${operator_name}") { update { control:Load-Balance-Key := &Calling-Station-ID control:Proxy-To-Realm := 'eduroam_flr' @@ -438,7 +438,7 @@ server eduroam-inner { # the domain portion of the outer and inner identities must match. split_username_nai if (noop || (&Stripped-User-Domain && \ - (&outer.Stripped-User-Domain != &Stripped-User-Domain))) { + (outer.Stripped-User-Domain != &Stripped-User-Domain))) { reject } @@ -446,7 +446,7 @@ server eduroam-inner { # it in the outer server. if (&outer.session-state:) update { - &outer.session-state:Stripped-User-Name := &Stripped-User-Name + outer.session-state:Stripped-User-Name := &Stripped-User-Name } } diff --git a/doc/antora/modules/howto/pages/eduroam_logging.adoc b/doc/antora/modules/howto/pages/eduroam_logging.adoc index c727142ce53..2de4626490e 100644 --- a/doc/antora/modules/howto/pages/eduroam_logging.adoc +++ b/doc/antora/modules/howto/pages/eduroam_logging.adoc @@ -61,7 +61,7 @@ Make these changes in the default server (`raddb/sites-enabled/default`). authorize { if (!&session-state:) { update session-state { - &Tmp-String-1 := "request" + Tmp-String-1 := "request" } linelog } @@ -79,13 +79,13 @@ update `post-auth`: post-auth { ... update outer.session-state { - &User-Name := &User-Name + User-Name := &User-Name } Post-Auth-Type REJECT { ... update outer.session-state { - &User-Name := &User-Name + User-Name := &User-Name } } } @@ -101,14 +101,14 @@ log the reply with the required attributes. post-auth { ... update session-state { - &Tmp-String-1 := "accept" + Tmp-String-1 := "accept" } linelog Post-Auth-Type REJECT { ... update session-state { - &Tmp-String-1 := "reject" + Tmp-String-1 := "reject" } linelog } diff --git a/doc/antora/modules/howto/pages/installation/upgrade.adoc b/doc/antora/modules/howto/pages/installation/upgrade.adoc index 8876fa64d88..2265cd2fa8f 100644 --- a/doc/antora/modules/howto/pages/installation/upgrade.adoc +++ b/doc/antora/modules/howto/pages/installation/upgrade.adoc @@ -318,9 +318,9 @@ For example, instead of doing this: [source,unlang] ---- -if (&User-Name == "bob") { +if (User-Name == "bob") { update reply { - &Reply-Message := "Hello, %{User-Name}" + Reply-Message := "Hello, %{User-Name}" } } ---- @@ -329,8 +329,8 @@ You can now do this: [source,unlang] ---- -if (&User-Name == "bob") { - &reply.Reply-Message := "Hello, %{User-Name}" +if (User-Name == "bob") { + reply.Reply-Message := "Hello, %{User-Name}" } ---- @@ -613,7 +613,7 @@ you should edit the `reply` list, using the `+=` operator: ``` reply += { - &Reply-Message = "foo" + Reply-Message = "foo" } ``` @@ -626,7 +626,7 @@ For example, in v3 you would do: ``` update reply { - &Framed-IP-Address := "%{sql:SELECT ...}" + Framed-IP-Address := "%{sql:SELECT ...}" } ``` @@ -1126,7 +1126,7 @@ In v3, many people had a habit of just adding `"..."` around _everything_. For [source,unlang] ---- update reply { - &Reply-Message := "%{User-Name}" + Reply-Message := "%{User-Name}" } ... @@ -1148,7 +1148,7 @@ reply.Reply-Message := &User-Name ... -if (&User-Name == "bob") { +if (User-Name == "bob") { ... } ---- diff --git a/doc/antora/modules/howto/pages/modules/chap/index.adoc b/doc/antora/modules/howto/pages/modules/chap/index.adoc index d8a9f209f67..0baec65cda2 100644 --- a/doc/antora/modules/howto/pages/modules/chap/index.adoc +++ b/doc/antora/modules/howto/pages/modules/chap/index.adoc @@ -78,7 +78,7 @@ containing `ERROR` or `WARNING`, or the `chap` module name. (0) CHAP-Password = 0x3549a4e40fc76e876499badf736712c951 ... (0) chap - Creating &CHAP-Challenge from request authenticator -(0) chap - Setting &control.Auth-Type = chap +(0) chap - Setting control.Auth-Type = chap (0) chap (ok) ... (0) Found "known good" password in &control.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 1c2c56cf8bc..c10e3f37534 100644 --- a/doc/antora/modules/howto/pages/modules/ldap/authentication.adoc +++ b/doc/antora/modules/howto/pages/modules/ldap/authentication.adoc @@ -39,14 +39,14 @@ On the FreeRADIUS debug terminal side, you should see something like: (0) ldap - Waiting for search result... (0) ldap - User object found at DN "uid=john,ou=people,dc=example,dc=com" (0) ldap - Processing user attributes -(0) ldap - &control.Password.With-Header += password +(0) ldap - control.Password.With-Header += password (0) ldap - Released connection (0) (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 - Setting &control.Auth-Type = pap +(0) pap - Setting control.Auth-Type = pap (0) pap (updated) (0) } # recv Access-Request (updated) (0) Running 'authenticate pap' from file /usr/local/etc/raddb/sites-enabled/default @@ -149,7 +149,7 @@ You have two options available to you here (`Ctrl-C` the running FreeRADIUS serv ---- -ldap if ((ok || updated) && &User-Password) { - &control.Auth-Type := ldap + control.Auth-Type := ldap } ---- ** FreeRADIUS is now configured to attempt to LDAP bind if the `ldap` module finds a user and the RADIUS request contains a `User-Password` RADIUS attribute @@ -168,7 +168,7 @@ If you use LDAP bind'ing to perform user authentication, then when `radclient` r (0) ldap - Released connection (0) (0) ldap (ok) (0) if ((ok || updated) && &User-Password) { -(0) &control.Auth-Type := ldap +(0) control.Auth-Type := ldap (0) } # if ((ok || updated) && &User-Password) (noop) (0) expiration (noop) (0) pap - WARNING: No "known good" password found for the user. Not setting Auth-Type diff --git a/doc/antora/modules/howto/pages/modules/ldap/authorization/groups.adoc b/doc/antora/modules/howto/pages/modules/ldap/authorization/groups.adoc index a2e945924f4..2b2b6e72a2b 100644 --- a/doc/antora/modules/howto/pages/modules/ldap/authorization/groups.adoc +++ b/doc/antora/modules/howto/pages/modules/ldap/authorization/groups.adoc @@ -144,7 +144,7 @@ appropriately. [source,unlang] ---- if (%ldap.group("cn=foo,ou=groups,dc=example,dc=com") == true) { - &reply.Reply-Message := "Welcome member of group 'foo'" + reply.Reply-Message := "Welcome member of group 'foo'" } ---- @@ -153,7 +153,7 @@ if (%ldap.group("cn=foo,ou=groups,dc=example,dc=com") == true) { [source,unlang] ---- if (%ldap.group("foo") == true) { - &reply.Reply-Message := "Welcome member of group 'foo'" + reply.Reply-Message := "Welcome member of group 'foo'" } ---- diff --git a/doc/antora/modules/howto/pages/modules/ldap/base_configuration/index.adoc b/doc/antora/modules/howto/pages/modules/ldap/base_configuration/index.adoc index 831ecee0136..bed2feabf57 100644 --- a/doc/antora/modules/howto/pages/modules/ldap/base_configuration/index.adoc +++ b/doc/antora/modules/howto/pages/modules/ldap/base_configuration/index.adoc @@ -154,7 +154,7 @@ server default { recv Access-Request { ldap if (ok || updated) { - &control.Auth-Type := ldap + control.Auth-Type := ldap } } 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 908d197242c..3a5e5af31af 100644 --- a/doc/antora/modules/howto/pages/modules/ldap_authentication_testing.adoc +++ b/doc/antora/modules/howto/pages/modules/ldap_authentication_testing.adoc @@ -35,14 +35,14 @@ On the FreeRADIUS debug terminal side, you should see something like: (0) ldap - Waiting for search result... (0) ldap - User object found at DN "uid=john,ou=people,dc=example,dc=com" (0) ldap - Processing user attributes -(0) ldap - &control:Password-With-Header += password +(0) ldap - control:Password-With-Header += password (0) ldap - Released connection (0) (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 - Setting &control:Auth-Type = pap +(0) pap - Setting control:Auth-Type = pap (0) pap (updated) (0) } # recv Access-Request (updated) (0) Running 'authenticate pap' from file /usr/local/etc/raddb/sites-enabled/default @@ -148,7 +148,7 @@ You have two options avaliable to you here (`Ctrl-C` the running FreeRADIUS serv -ldap if ((ok || updated) && &User-Password) { update { - &control:Auth-Type := ldap + control:Auth-Type := ldap } } ---- @@ -169,7 +169,7 @@ If you use LDAP bind'ing to perform user authentication, then when `radclient` r (0) ldap (ok) (0) if ((ok || updated) && &User-Password) { (0) update { -(0) &control:Auth-Type := ldap +(0) control:Auth-Type := ldap (0) } # update (noop) (0) } # if ((ok || updated) && &User-Password) (noop) (0) expiration (noop) diff --git a/doc/antora/modules/howto/pages/modules/rest/configuration.adoc b/doc/antora/modules/howto/pages/modules/rest/configuration.adoc index 146afe99b33..8cf74f3e622 100644 --- a/doc/antora/modules/howto/pages/modules/rest/configuration.adoc +++ b/doc/antora/modules/howto/pages/modules/rest/configuration.adoc @@ -111,7 +111,7 @@ server default { ... recv Access-Request { if (&User-Password) { - &control.Auth-Type := rest + control.Auth-Type := rest } } diff --git a/doc/antora/modules/howto/pages/modules/sqlippool/index.adoc b/doc/antora/modules/howto/pages/modules/sqlippool/index.adoc index 190eb800950..f968e92105c 100644 --- a/doc/antora/modules/howto/pages/modules/sqlippool/index.adoc +++ b/doc/antora/modules/howto/pages/modules/sqlippool/index.adoc @@ -306,7 +306,7 @@ send Access-Accept { noop = return } # On failure for any reason, reject - &reply += { + reply += { Reply-Message = Module-Failure-Message } reject @@ -550,7 +550,7 @@ echo "INSERT INTO radcheck (username,attribute,op,value) \ ---- send Access-Accept { ... - &control.IP-Pool.Name := 'internet' + control.IP-Pool.Name := 'internet' sqlippool ... } diff --git a/doc/antora/modules/howto/pages/protocols/dhcp/policy_common_options.adoc b/doc/antora/modules/howto/pages/protocols/dhcp/policy_common_options.adoc index ca4d98fee52..9fd7aaf530a 100644 --- a/doc/antora/modules/howto/pages/protocols/dhcp/policy_common_options.adoc +++ b/doc/antora/modules/howto/pages/protocols/dhcp/policy_common_options.adoc @@ -31,10 +31,10 @@ applicable to all clients in this policy. ---- dhcp_common { update reply { - &DHCP-Domain-Name-Server := 8.8.8.8 - &DHCP-Domain-Name-Server += 8.8.4.4 - &DHCP-Subnet-Mask := 255.255.255.0 - &DHCP-Router-Address := 192.0.2.1 + DHCP-Domain-Name-Server := 8.8.8.8 + DHCP-Domain-Name-Server += 8.8.4.4 + DHCP-Subnet-Mask := 255.255.255.0 + DHCP-Router-Address := 192.0.2.1 ... } } @@ -64,7 +64,7 @@ the block: [source,unlang] ---- update control { - &Pool-Name := "local" + Pool-Name := "local" } dhcp_sqlippool ---- diff --git a/doc/antora/modules/howto/pages/protocols/dhcp/policy_device_options.adoc b/doc/antora/modules/howto/pages/protocols/dhcp/policy_device_options.adoc index 05845ea8934..34539613491 100644 --- a/doc/antora/modules/howto/pages/protocols/dhcp/policy_device_options.adoc +++ b/doc/antora/modules/howto/pages/protocols/dhcp/policy_device_options.adoc @@ -80,11 +80,11 @@ above: ---- if (&DHCP-User-Class && "%{substring:&DHCP-User-Class 0 4}" == "iPXE") { update reply { - &DHCP-Boot-Filename := "http://my.web.server/boot_script.php" + DHCP-Boot-Filename := "http://my.web.server/boot_script.php" } } else { update reply { - &DHCP-Boot-Filename := "undionly.kpxe" + DHCP-Boot-Filename := "undionly.kpxe" } } ---- @@ -99,7 +99,7 @@ provided that it matches the given format: if (&DHCP-Client-Identifier && \ "%{string:DHCP-Client-Identifier}" =~ /^RAS([0-9])-site([A-Z])$/) { update reply { - &DHCP-Boot-Filename := "rasboot-%{1}-%{2}.kpxe" + DHCP-Boot-Filename := "rasboot-%{1}-%{2}.kpxe" } } ---- @@ -214,8 +214,8 @@ context: [source,unlang] ---- update control { - &DHCP-SQL-Option-Context := "by-mac" - &DHCP-SQL-Option-Identifier := &request:DHCP-Client-Hardware-Address + DHCP-SQL-Option-Context := "by-mac" + DHCP-SQL-Option-Identifier := &request:DHCP-Client-Hardware-Address } dhcp_sql.authorize ---- @@ -266,8 +266,8 @@ sample data you could invoke an SQL lookup as shown: [source,unlang] ---- update control { - &DHCP-SQL-Option-Context := "class-vendor" - &DHCP-SQL-Option-Identifier := \ + DHCP-SQL-Option-Context := "class-vendor" + DHCP-SQL-Option-Identifier := \ "%{substring:%{hex:&DHCP-Client-Hardware-Address} 0 6}" } dhcp_sql.authorize diff --git a/doc/antora/modules/howto/pages/protocols/dhcp/test.adoc b/doc/antora/modules/howto/pages/protocols/dhcp/test.adoc index 322de08fa99..c9783562861 100644 --- a/doc/antora/modules/howto/pages/protocols/dhcp/test.adoc +++ b/doc/antora/modules/howto/pages/protocols/dhcp/test.adoc @@ -10,7 +10,7 @@ server to include the following: [source,unlang] ---- update reply { - &DHCP-Your-IP-Address := 1.2.3.4 + DHCP-Your-IP-Address := 1.2.3.4 } ---- diff --git a/doc/antora/modules/howto/pages/protocols/proxy/radsec_client.adoc b/doc/antora/modules/howto/pages/protocols/proxy/radsec_client.adoc index d92345e9e82..163eac51d1d 100644 --- a/doc/antora/modules/howto/pages/protocols/proxy/radsec_client.adoc +++ b/doc/antora/modules/howto/pages/protocols/proxy/radsec_client.adoc @@ -72,7 +72,7 @@ the `authorize` and `preacct` sections looks as follows: authorize { update control { - &Proxy-To-Realm := tls + Proxy-To-Realm := tls } handled ... @@ -80,7 +80,7 @@ the `authorize` and `preacct` sections looks as follows: ... preacct { update control { - &Proxy-To-Realm := tls + Proxy-To-Realm := tls } handled ... diff --git a/doc/antora/modules/reference/pages/unlang/break.adoc b/doc/antora/modules/reference/pages/unlang/break.adoc index c15adcb926e..cf8b382a650 100644 --- a/doc/antora/modules/reference/pages/unlang/break.adoc +++ b/doc/antora/modules/reference/pages/unlang/break.adoc @@ -14,11 +14,11 @@ inside of a xref:unlang/foreach.adoc[foreach] loop. [source,unlang] ---- foreach &Class { - if (&Foreach-Variable-0 == 0xabcdef) { + if (Foreach-Variable-0 == 0xabcdef) { break } - &reply += { + reply += { Reply-Message = "Contains %{Foreach-Variable-0}" } } diff --git a/doc/antora/modules/reference/pages/unlang/caller.adoc b/doc/antora/modules/reference/pages/unlang/caller.adoc index 0e8ce2dc318..3086ef96594 100644 --- a/doc/antora/modules/reference/pages/unlang/caller.adoc +++ b/doc/antora/modules/reference/pages/unlang/caller.adoc @@ -61,8 +61,8 @@ request to the current RADIUS reply packet, as the contents of the [source,unlang] ---- caller dhcpv4 { - &reply += { - &Filter-Id = &parent.request.Client-Identifier + reply += { + Filter-Id = &parent.request.Client-Identifier } } ---- diff --git a/doc/antora/modules/reference/pages/unlang/condition/cmp.adoc b/doc/antora/modules/reference/pages/unlang/condition/cmp.adoc index 8bc778aacff..634325cb93a 100644 --- a/doc/antora/modules/reference/pages/unlang/condition/cmp.adoc +++ b/doc/antora/modules/reference/pages/unlang/condition/cmp.adoc @@ -81,7 +81,7 @@ types, as with the following example: .Example [source,unlang] ---- -(ipaddr)&Class == 127.0.0.1 +(ipaddr)Class == 127.0.0.1 ---- In this example, the `Class` attribute is treated as if it was an IPv4 diff --git a/doc/antora/modules/reference/pages/unlang/condition/index.adoc b/doc/antora/modules/reference/pages/unlang/condition/index.adoc index fb633eff576..5fbbd2fdc8c 100644 --- a/doc/antora/modules/reference/pages/unlang/condition/index.adoc +++ b/doc/antora/modules/reference/pages/unlang/condition/index.adoc @@ -32,15 +32,15 @@ Conditions are expressed using the following syntax: .Examples [source,unlang] ---- -if ( &User-Name == "bob" ) { +if ( User-Name == "bob" ) { ... } -if ( &Framed-IP-Address == 127.0.0.1 ) { +if ( Framed-IP-Address == 127.0.0.1 ) { ... } -if ( &Calling-Station-Id == "%sql("SELECT ...") ) { +if ( Calling-Station-Id == "%sql("SELECT ...") ) { ... } ---- @@ -102,7 +102,7 @@ It should instead be written as: .Simplified Example [source,unlang] ---- -if (&Framed-IP-Address == 192.0.2.1) { +if (Framed-IP-Address == 192.0.2.1) { ... } ---- diff --git a/doc/antora/modules/reference/pages/unlang/condition/regex.adoc b/doc/antora/modules/reference/pages/unlang/condition/regex.adoc index 31784bd037f..9e4b11f9da0 100644 --- a/doc/antora/modules/reference/pages/unlang/condition/regex.adoc +++ b/doc/antora/modules/reference/pages/unlang/condition/regex.adoc @@ -36,7 +36,7 @@ resulting string. ==== [source,unlang] ---- -if (&User-Name =~ /@example\.com$/) { +if (User-Name =~ /@example\.com$/) { ... } ---- @@ -128,8 +128,8 @@ more information on regular expression matching. ==== [source,unlang] ---- -if (&User-Name =~ /^(.*)@example\.com$/) { - &reply += { +if (User-Name =~ /^(.*)@example\.com$/) { + reply += { Reply-Message = "Hello %{1}" } } @@ -163,7 +163,7 @@ switch (realm) { } } -if (&Stripped-User-Name =~ /^%{pattern}$/) { +if (Stripped-User-Name =~ /^%{pattern}$/) { ... } ---- @@ -185,7 +185,7 @@ saved during evaluation. ==== [source,unlang] ---- -if (&User-Name =~ /^@%{Tmp-String-0}$/) { +if (User-Name =~ /^@%{Tmp-String-0}$/) { ... } ---- @@ -200,7 +200,7 @@ using the PCRE alternation '|' operator. ==== [source,unlang] ---- -if (&User-Name =~ /^@(%{Tmp-String-0}|%{Tmp-String-1})$/) { +if (User-Name =~ /^@(%{Tmp-String-0}|%{Tmp-String-1})$/) { ... } ---- diff --git a/doc/antora/modules/reference/pages/unlang/detach.adoc b/doc/antora/modules/reference/pages/unlang/detach.adoc index 417e73a4e3e..959e6834a7d 100644 --- a/doc/antora/modules/reference/pages/unlang/detach.adoc +++ b/doc/antora/modules/reference/pages/unlang/detach.adoc @@ -19,10 +19,10 @@ access any attributes in the parent. [source,unlang] ---- subrequest Disconnect-Request { - &User-Name := &parent.request.User-Name - &NAS-IP-Address := &parent.request.NAS-IP-Address - &NAS-Port := &parent.request.NAS-Port - &Acct-Session-Id := &parent.request.Acct-Session-Id + User-Name := &parent.request.User-Name + NAS-IP-Address := &parent.request.NAS-IP-Address + NAS-Port := &parent.request.NAS-Port + Acct-Session-Id := &parent.request.Acct-Session-Id detach radius @@ -50,12 +50,12 @@ seconds. Only integer seconds can be set. [source,unlang] ---- subrequest Disconnect-Request { - &User-Name := &parent.request.User-Name - &NAS-IP-Address := &parent.request.NAS-IP-Address - &NAS-Port := &parent.request.NAS-Port - &Acct-Session-Id := &parent.request.Acct-Session-Id + User-Name := &parent.request.User-Name + NAS-IP-Address := &parent.request.NAS-IP-Address + NAS-Port := &parent.request.NAS-Port + Acct-Session-Id := &parent.request.Acct-Session-Id - &control.Request-Lifetime := 60 + control.Request-Lifetime := 60 detach radius diff --git a/doc/antora/modules/reference/pages/unlang/edit.adoc b/doc/antora/modules/reference/pages/unlang/edit.adoc index 04ae581f6d6..0e3674268f0 100644 --- a/doc/antora/modules/reference/pages/unlang/edit.adoc +++ b/doc/antora/modules/reference/pages/unlang/edit.adoc @@ -15,7 +15,7 @@ attribute -= ... list1 := &list2 -list1 += { &attribute = value, ... } +list1 += { attribute = value, ... } list1 += " attribute = value, ... " ... ---- @@ -198,7 +198,7 @@ given. [source,unlang] ---- reply += { - &Filter-Id = "foo" + Filter-Id = "foo" } ---- ==== @@ -228,7 +228,7 @@ overriding the contents of a list. [source,unlang] ---- reply := { - &Filter-Id = "foo" + Filter-Id = "foo" } ---- ==== @@ -261,7 +261,7 @@ reply -= &Filter-Id[*] [source,unlang] ---- reply -= { - &Filter-Id == "bar" + Filter-Id == "bar" } ---- ==== diff --git a/doc/antora/modules/reference/pages/unlang/else.adoc b/doc/antora/modules/reference/pages/unlang/else.adoc index e6164381718..0c7cd6420e0 100644 --- a/doc/antora/modules/reference/pages/unlang/else.adoc +++ b/doc/antora/modules/reference/pages/unlang/else.adoc @@ -18,7 +18,7 @@ and the statements within the `else` subsection are executed. .Example [source,unlang] ---- -if (&User-Name == "bob") { +if (User-Name == "bob") { reject } else { diff --git a/doc/antora/modules/reference/pages/unlang/elsif.adoc b/doc/antora/modules/reference/pages/unlang/elsif.adoc index dcc3ab33e12..ac2e15b0ca2 100644 --- a/doc/antora/modules/reference/pages/unlang/elsif.adoc +++ b/doc/antora/modules/reference/pages/unlang/elsif.adoc @@ -31,10 +31,10 @@ conditional checks and statements. .Example [source,unlang] ---- -if (&User-Name == "bob") { +if (User-Name == "bob") { reject } -elsif (&User-Name == "doug") { +elsif (User-Name == "doug") { ok } ---- diff --git a/doc/antora/modules/reference/pages/unlang/expression.adoc b/doc/antora/modules/reference/pages/unlang/expression.adoc index a4f1a952d33..99986386c3b 100644 --- a/doc/antora/modules/reference/pages/unlang/expression.adoc +++ b/doc/antora/modules/reference/pages/unlang/expression.adoc @@ -11,7 +11,7 @@ Expressions can be used inside of xref:xlat/index.adoc[dynamic expansions], or i .Expression in a Condition [source,unlang] ---- -(&NAS-Port == 1 + 2) +(NAS-Port == 1 + 2) ---- .Expression in an assignment @@ -62,7 +62,7 @@ supported. For example: [source,unlang] ---- -NAS-Port = 5 + (&User-Name == "bob") +NAS-Port = 5 + (User-Name == "bob") ---- This expression will return `6` if the users name is `bob`, and `5` otherwise. diff --git a/doc/antora/modules/reference/pages/unlang/filter.adoc b/doc/antora/modules/reference/pages/unlang/filter.adoc index 814d2d155ed..77dc2711e76 100644 --- a/doc/antora/modules/reference/pages/unlang/filter.adoc +++ b/doc/antora/modules/reference/pages/unlang/filter.adoc @@ -10,13 +10,13 @@ group { uint32 small uint32 large - &large = 10000 - &small = 10 + large = 10000 + small = 10 # # Enforce it # - &large <= &small + large <= &small # &large now has value '10' diff --git a/doc/antora/modules/reference/pages/unlang/foreach.adoc b/doc/antora/modules/reference/pages/unlang/foreach.adoc index 16b99a82515..99ed1126a39 100644 --- a/doc/antora/modules/reference/pages/unlang/foreach.adoc +++ b/doc/antora/modules/reference/pages/unlang/foreach.adoc @@ -70,7 +70,7 @@ the execution of the loop. Tmp-Integer-0 := { 1, 3, 5, 11 } foreach self (&Tmp-Integer-0) { - &self += 19 + self += 19 } ---- @@ -149,8 +149,8 @@ In this example, we have to explicitly give a data type `string`. The data type [source,unlang] ---- foreach string child (&TLV-Thing.[*]) { - &out += &child - &out += " " + out += &child + out += " " } ---- @@ -162,8 +162,8 @@ examined, but cannot be changed. This is a limitation of the current interprete [source,unlang] ---- foreach thing (&Tmp-TLV-0[*]) { - &out += &thing.c - &out += " " + out += &thing.c + out += " " } ---- diff --git a/doc/antora/modules/reference/pages/unlang/if.adoc b/doc/antora/modules/reference/pages/unlang/if.adoc index 86cfe3f0204..add4e13ccce 100644 --- a/doc/antora/modules/reference/pages/unlang/if.adoc +++ b/doc/antora/modules/reference/pages/unlang/if.adoc @@ -20,7 +20,7 @@ an xref:unlang/elsif.adoc[elsif] statement. .Example [source,unlang] ---- -if (&User-Name == "bob") { +if (User-Name == "bob") { reject } ---- @@ -36,7 +36,7 @@ There is no need to put brackets around a __. The following two exam .Example With Brackets [source,unlang] ---- -if (&User-Name == "bob") { +if (User-Name == "bob") { reject } ---- @@ -46,7 +46,7 @@ And without: .Example Without Brackes [source,unlang] ---- -if &User-Name == "bob" { +if User-Name == "bob" { reject } ---- @@ -62,7 +62,7 @@ A __ can span multiple lines. There is no need to use `\\` at the en .Example With Brackets [source,unlang] ---- -if (&User-Name == +if (User-Name == "bob") { reject } diff --git a/doc/antora/modules/reference/pages/unlang/index.adoc b/doc/antora/modules/reference/pages/unlang/index.adoc index 1393217dbb3..4bcc321895d 100644 --- a/doc/antora/modules/reference/pages/unlang/index.adoc +++ b/doc/antora/modules/reference/pages/unlang/index.adoc @@ -62,7 +62,7 @@ can be used to control the flow of processing. .Example [source,unlang] ---- -if ((&User-Name == "bob") && (&Calling-Station-Id == "00:01:03:04:05")) { +if ((User-Name == "bob") && (Calling-Station-Id == "00:01:03:04:05")) { ... } ---- @@ -116,9 +116,9 @@ error. [source,unlang] ---- reply += { - &Framed-IP-Address = 192.0.2.4 - &Session-Timeout = 5 - &Reply-Message = "hello" + Framed-IP-Address = 192.0.2.4 + Session-Timeout = 5 + Reply-Message = "hello" } ---- @@ -157,12 +157,12 @@ attribute contents or lists of attributes. # followed by condition which checks that the User-Name # attribute has value "bob" -if (&User-Name == "bob") { +if (User-Name == "bob") { # followed by instructions to add the Reply-Message # attribute to the "reply" list, with contents # "Hello, bob" - &reply.Reply-Message := "Hello, bob" + reply.Reply-Message := "Hello, bob" } ---- diff --git a/doc/antora/modules/reference/pages/unlang/local.adoc b/doc/antora/modules/reference/pages/unlang/local.adoc index cbe7f0dca3e..3a737059ba4 100644 --- a/doc/antora/modules/reference/pages/unlang/local.adoc +++ b/doc/antora/modules/reference/pages/unlang/local.adoc @@ -51,12 +51,12 @@ Local variables _cannot_ be deleted. When the current scope exits, the local va .Example [source,unlang] ---- -if (&User-Name == "bob") { +if (User-Name == "bob") { uint32 len - &len := %length(%{User-Name}) + len := %length(%{User-Name}) - &Reply-Message := "Length of %{User-Name} is %{len}" + Reply-Message := "Length of %{User-Name} is %{len}" } ---- @@ -66,7 +66,7 @@ attributes. These are no longer necessary, and should not be used. .Local variables exist on only if they have been created [source,unlang] ---- -if (&User-Name == "bob") { +if (User-Name == "bob") { # declare "len" as ALLOWED to be used uint32 len @@ -76,9 +76,9 @@ if (&User-Name == "bob") { } # "len" is created, and can now be used - &len := %length(%{User-Name}) + len := %length(%{User-Name}) - &Reply-Message := "Length of %{User-Name} is %{len}" + Reply-Message := "Length of %{User-Name} is %{len}" } ---- diff --git a/doc/antora/modules/reference/pages/unlang/map.adoc b/doc/antora/modules/reference/pages/unlang/map.adoc index 32931f4034f..2a1139037c1 100644 --- a/doc/antora/modules/reference/pages/unlang/map.adoc +++ b/doc/antora/modules/reference/pages/unlang/map.adoc @@ -46,9 +46,9 @@ are affected. [source,unlang] ---- map sql "SELECT column1, column2, column3 from table WHERE user=%{User-Name}" { - &reply.Framed-IP-Address := 'column1' - &reply.Filter-Id := 'column2' - &reply.Reply-Message := 'column3' + reply.Framed-IP-Address := 'column1' + reply.Filter-Id := 'column2' + reply.Reply-Message := 'column3' } ---- diff --git a/doc/antora/modules/reference/pages/unlang/module.adoc b/doc/antora/modules/reference/pages/unlang/module.adoc index 643e6af4fc7..66800ff6c35 100644 --- a/doc/antora/modules/reference/pages/unlang/module.adoc +++ b/doc/antora/modules/reference/pages/unlang/module.adoc @@ -45,8 +45,8 @@ perform different actions based on the behaviour of the modules. ---- sql if (notfound) { - &reply += { - &Reply-Message = "We don't know who you are" + reply += { + Reply-Message = "We don't know who you are" } reject } diff --git a/doc/antora/modules/reference/pages/unlang/module_builtin.adoc b/doc/antora/modules/reference/pages/unlang/module_builtin.adoc index 9b8620727bb..4a857cbe1a7 100644 --- a/doc/antora/modules/reference/pages/unlang/module_builtin.adoc +++ b/doc/antora/modules/reference/pages/unlang/module_builtin.adoc @@ -31,8 +31,8 @@ Causes the request to be immediately rejected. [source,unlang] ---- if (!&User-Name) { - &reply += { - &Reply-Message = "We don't know who you are" + reply += { + Reply-Message = "We don't know who you are" } reject } diff --git a/doc/antora/modules/reference/pages/unlang/parallel.adoc b/doc/antora/modules/reference/pages/unlang/parallel.adoc index ed53d25f3fd..28c4ee4677b 100644 --- a/doc/antora/modules/reference/pages/unlang/parallel.adoc +++ b/doc/antora/modules/reference/pages/unlang/parallel.adoc @@ -84,8 +84,8 @@ parallel { radius1 if (fail) { linelog1 - &parent.reply += { - &Reply-Message = "radius1 failed" + parent.reply += { + Reply-Message = "radius1 failed" } } } @@ -93,8 +93,8 @@ parallel { radius2 if (fail) { linelog2 - &parent.reply += { - &Reply-Message = "radius2 failed" + parent.reply += { + Reply-Message = "radius2 failed" } } } @@ -136,16 +136,16 @@ a different way from the parent `User-Name`, and it sees a ---- parallel empty { group { - &request := { - &User-Name = "%{&parent.request.User-Name}@example.org" - &User-Password = "hello" + request := { + User-Name = "%{&parent.request.User-Name}@example.org" + User-Password = "hello" } radius1 } group { - &request := { - &User-Name = "%{&parent.request.User-Name}@example.com" - &User-Password = &parent.request.User-Password + request := { + User-Name = "%{&parent.request.User-Name}@example.com" + User-Password = &parent.request.User-Password } radius2 } diff --git a/doc/antora/modules/reference/pages/unlang/return.adoc b/doc/antora/modules/reference/pages/unlang/return.adoc index 97e388835e7..a658ee32acb 100644 --- a/doc/antora/modules/reference/pages/unlang/return.adoc +++ b/doc/antora/modules/reference/pages/unlang/return.adoc @@ -26,7 +26,7 @@ from the enclosing processing section which called the policy. [source,unlang] ---- sql -if (&reply.Filter-Id == "hello") { +if (reply.Filter-Id == "hello") { return } ... diff --git a/doc/antora/modules/reference/pages/unlang/subrequest.adoc b/doc/antora/modules/reference/pages/unlang/subrequest.adoc index f06a0ce8ef0..41a11a0404d 100644 --- a/doc/antora/modules/reference/pages/unlang/subrequest.adoc +++ b/doc/antora/modules/reference/pages/unlang/subrequest.adoc @@ -68,10 +68,10 @@ the last statement that was executed. [source,unlang] ---- subrequest ::Disconnect-Request { - &User-Name := &parent.request.User-Name - &NAS-IP-Address := &parent.request.NAS-IP-Address - &NAS-Port := &parent.request.NAS-Port - &Acct-Session-Id := &parent.request.Acct-Session-Id + User-Name := &parent.request.User-Name + NAS-IP-Address := &parent.request.NAS-IP-Address + NAS-Port := &parent.request.NAS-Port + Acct-Session-Id := &parent.request.Acct-Session-Id radius } @@ -89,7 +89,7 @@ parsed in the context of the new protocol. [source,unlang] ---- subrequest @dhcpv4::Discover { - &Your-IP-Address := &parent.request.Framed-IP-Address + Your-IP-Address := &parent.request.Framed-IP-Address ... } @@ -169,10 +169,10 @@ request, the child can no longer access any attributes in the parent. [source,unlang] ---- subrequest ::Disconnect-Request { - &User-Name := &parent.request.User-Name - &NAS-IP-Address := &parent.request.NAS-IP-Address - &NAS-Port := &parent.request.NAS-Port - &Acct-Session-Id := &parent.request.Acct-Session-Id + User-Name := &parent.request.User-Name + NAS-IP-Address := &parent.request.NAS-IP-Address + NAS-Port := &parent.request.NAS-Port + Acct-Session-Id := &parent.request.Acct-Session-Id detach radius diff --git a/doc/antora/modules/reference/pages/unlang/transaction.adoc b/doc/antora/modules/reference/pages/unlang/transaction.adoc index 89747b340cd..4cee695b8f2 100644 --- a/doc/antora/modules/reference/pages/unlang/transaction.adoc +++ b/doc/antora/modules/reference/pages/unlang/transaction.adoc @@ -41,8 +41,8 @@ In this example, if the SQL `select` statement fails, then the [source,unlang] ---- transaction { - &reply.Filter-Id := %sql("SELECT ...") - &reply.Framed-IP-Address := 192.0.2.1 + reply.Filter-Id := %sql("SELECT ...") + reply.Framed-IP-Address := 192.0.2.1 } ---- diff --git a/doc/antora/modules/reference/pages/unlang/update.adoc b/doc/antora/modules/reference/pages/unlang/update.adoc index c500daf3cf9..9ab8735aedb 100644 --- a/doc/antora/modules/reference/pages/unlang/update.adoc +++ b/doc/antora/modules/reference/pages/unlang/update.adoc @@ -38,10 +38,10 @@ The following example creates four attributes, and appends them to the [source,unlang] ---- update request { - &User-Name += "foo" - &Filter-Id += "bar" - &NAS-IP-Address += 127.0.0.1 - &NAS-Port += 5 + User-Name += "foo" + Filter-Id += "bar" + NAS-IP-Address += 127.0.0.1 + NAS-Port += 5 } ---- @@ -50,10 +50,10 @@ This example should be converted to the following syntax: [source,unlang] ---- request += { - &User-Name = "foo" - &Filter-Id = "bar" - &NAS-IP-Address = 127.0.0.1 - &NAS-Por = 5 + User-Name = "foo" + Filter-Id = "bar" + NAS-IP-Address = 127.0.0.1 + NAS-Por = 5 } ---- @@ -73,8 +73,8 @@ The following example over-writes the values for two attributes in the [source,unlang] ---- update request { - &User-Name := "foo" - &Filter-Id := "bar" + User-Name := "foo" + Filter-Id := "bar" } ---- @@ -95,8 +95,8 @@ assigned to it. [source,unlang] ---- request := { - &User-Name = "foo" - &Filter-Id = "bar" + User-Name = "foo" + Filter-Id = "bar" } ---- === Conditionally Over-writing attributes in a list: = @@ -107,8 +107,8 @@ The following example conditionally over-writes the values for two attributes in [source,unlang] ---- update request { - &User-Name = "foo" - &Filter-Id = "bar" + User-Name = "foo" + Filter-Id = "bar" } ---- diff --git a/doc/antora/modules/reference/pages/xlat/builtin.adoc b/doc/antora/modules/reference/pages/xlat/builtin.adoc index 57cefa86446..daf41ca59af 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)" } ---- @@ -130,10 +130,10 @@ Evaluates the string as an expansion, and returns the result. The main differen [source,unlang] ---- -if (&User-Name == "bob") { - &request.Tmp-String-0 := "&User-Name" +if (User-Name == "bob") { + request.Tmp-String-0 := "&User-Name" } else { - &request.Tmp-String-0 := "not bob!" + request.Tmp-String-0 := "not bob!" } reply.Reply-Message := "%eval(&request.Tmp-String-0}" @@ -276,13 +276,13 @@ group { date tomorrow time_delta time_of_day - &now := %time('request') + now := %time('request') # We are this many seconds into one day - &time_of_day := &now % (time_delta) 1d + time_of_day := &now % (time_delta) 1d # calculate the start of today, and then add one day to that - &tomorrow := &now - &time_of_day + (time_delta) 1d + tomorrow := &now - &time_of_day + (time_delta) 1d } ---- @@ -298,16 +298,16 @@ group { date tomorrow time_delta time_of_day - &now := %time('request') + now := %time('request') # We are this many seconds into one day - &time_of_day := &now % (time_delta) 1d + time_of_day := &now % (time_delta) 1d # calculate the start of today, and then add one day to that - &tomorrow := &now - &time_of_day + (time_delta) 1d + tomorrow := &now - &time_of_day + (time_delta) 1d # add in the time zone offset - &tomorrow += %time('offset') + tomorrow += %time('offset') } ---- diff --git a/doc/antora/modules/reference/pages/xlat/concat.adoc b/doc/antora/modules/reference/pages/xlat/concat.adoc index 520016e2d62..b4666cb5602 100644 --- a/doc/antora/modules/reference/pages/xlat/concat.adoc +++ b/doc/antora/modules/reference/pages/xlat/concat.adoc @@ -14,14 +14,14 @@ expanded string. If you need to concatenate strings together in a policy, just [source,unlang] ---- control += { - &Tmp-String-0 = "aaa" - &Tmp-String-0 = "bb" - &Tmp-String-0 = "c" + Tmp-String-0 = "aaa" + Tmp-String-0 = "bb" + Tmp-String-0 = "c" } reply += { - &Reply-Message = "%concat(%{control.Tmp-String-0[*]}, ', ')" - &Reply-Message = "%concat(%{control.Tmp-String-0[*]}, ',')" + Reply-Message = "%concat(%{control.Tmp-String-0[*]}, ', ')" + Reply-Message = "%concat(%{control.Tmp-String-0[*]}, ',')" } ---- diff --git a/doc/antora/modules/reference/pages/xlat/conversion.adoc b/doc/antora/modules/reference/pages/xlat/conversion.adoc index 701a3e1918d..34a7034aafc 100644 --- a/doc/antora/modules/reference/pages/xlat/conversion.adoc +++ b/doc/antora/modules/reference/pages/xlat/conversion.adoc @@ -94,7 +94,7 @@ Quote URL special characters. ---- control.Tmp-String-0 := "http://example.org/" reply += { - &Reply-Message = "The urlquote of %{control.Tmp-String-0} is %urlquote(%{control.Tmp-String-0})" + Reply-Message = "The urlquote of %{control.Tmp-String-0} is %urlquote(%{control.Tmp-String-0})" } ---- @@ -116,7 +116,7 @@ Unquote URL special characters. ---- control.Tmp-String-0 := "http%%3A%%2F%%2Fexample.org%%2F" # Attention for the double %. reply += { - &Reply-Message = "The urlunquote of %{control.Tmp-String-0} is %urlunquote(%{control.Tmp-String-0})" + Reply-Message = "The urlunquote of %{control.Tmp-String-0} is %urlunquote(%{control.Tmp-String-0})" } ---- diff --git a/doc/antora/modules/reference/pages/xlat/dict.adoc b/doc/antora/modules/reference/pages/xlat/dict.adoc index fde19d7052c..b0770e28c38 100644 --- a/doc/antora/modules/reference/pages/xlat/dict.adoc +++ b/doc/antora/modules/reference/pages/xlat/dict.adoc @@ -19,14 +19,14 @@ expanded string. If you need to concatenate strings together in a policy, just [source,unlang] ---- control += { - &Tmp-String-0 = "aaa" - &Tmp-String-0 = "bb" - &Tmp-String-0 = "c" + Tmp-String-0 = "aaa" + Tmp-String-0 = "bb" + Tmp-String-0 = "c" } reply += { - &Reply-Message = "%concat(%{control.Tmp-String-0[*]}, ', ')" - &Reply-Message = "%concat(%{control.Tmp-String-0[*]}, ',')" + Reply-Message = "%concat(%{control.Tmp-String-0[*]}, ', ')" + Reply-Message = "%concat(%{control.Tmp-String-0[*]}, ',')" } ---- diff --git a/doc/antora/modules/reference/pages/xlat/function.adoc b/doc/antora/modules/reference/pages/xlat/function.adoc index e46236a632a..ce8cdf74a86 100644 --- a/doc/antora/modules/reference/pages/xlat/function.adoc +++ b/doc/antora/modules/reference/pages/xlat/function.adoc @@ -27,7 +27,7 @@ call syntax is for that function. .Example [source,unlang] ---- -if (&User-Name == %md5(&NAS-Identifier)) { +if (User-Name == %md5(&NAS-Identifier)) { reject } ---- diff --git a/doc/antora/modules/reference/pages/xlat/hash.adoc b/doc/antora/modules/reference/pages/xlat/hash.adoc index 59b442d8ecf..6a0511768e0 100644 --- a/doc/antora/modules/reference/pages/xlat/hash.adoc +++ b/doc/antora/modules/reference/pages/xlat/hash.adoc @@ -21,8 +21,8 @@ control.Tmp-String-1 := "Caipirinha" reply.control.Tmp-Octets-0 := "%hmacmd5(%{control.Tmp-String-0} %{control.Tmp-String-1})" reply += { - &Reply-Message = "The HMAC-MD5 of %{control.Tmp-String-1} in octets is %{control.Tmp-Octets-0}" - &Reply-Message = "The HMAC-MD5 of %{control.Tmp-String-1} in hex is %hex(control.Tmp-Octets-0)" + Reply-Message = "The HMAC-MD5 of %{control.Tmp-String-1} in octets is %{control.Tmp-Octets-0}" + Reply-Message = "The HMAC-MD5 of %{control.Tmp-String-1} in hex is %hex(control.Tmp-Octets-0)" } ---- @@ -48,8 +48,8 @@ control.Tmp-String-1 := "Caipirinha" control.Tmp-Octets-0 := "%hmacsha1(%{control.Tmp-String-0}, %{control.Tmp-String-1})" reply += { - &Reply-Message = "The HMAC-SHA1 of %{control.Tmp-String-1} in octets is %{control.Tmp-Octets-0}" - &Reply-Message = "The HMAC-SHA1 of %{control.Tmp-String-1} in hex is %hex(control.Tmp-Octets-0}" + Reply-Message = "The HMAC-SHA1 of %{control.Tmp-String-1} in octets is %{control.Tmp-Octets-0}" + Reply-Message = "The HMAC-SHA1 of %{control.Tmp-String-1} in hex is %hex(control.Tmp-Octets-0}" } ---- @@ -73,8 +73,8 @@ result is binary data. ---- control.Tmp-String-0 := "Caipirinha" reply += { - &Reply-Message = "md5 of %{control.Tmp-String-0} is octal=%md5(%{control.Tmp-String-0})" - &Reply-Message = "md5 of %{control.Tmp-String-0} is hex=%hex(%md5(%{control.Tmp-String-0}))" + Reply-Message = "md5 of %{control.Tmp-String-0} is octal=%md5(%{control.Tmp-String-0})" + Reply-Message = "md5 of %{control.Tmp-String-0} is hex=%hex(%md5(%{control.Tmp-String-0}))" } ---- @@ -121,8 +121,8 @@ families of digest functions. ---- control.Tmp-String-0 := "Caipirinha" reply += { - &Reply-Message = "The md5 of %{control.Tmp-String-0} in octal is %md5(%{control.Tmp-String-0}}" - &Reply-Message = "The md5 of %{control.Tmp-String-0} in hex is %hex(%md5(%{control.Tmp-String-0}}}" + Reply-Message = "The md5 of %{control.Tmp-String-0} in octal is %md5(%{control.Tmp-String-0}}" + Reply-Message = "The md5 of %{control.Tmp-String-0} in hex is %hex(%md5(%{control.Tmp-String-0}}}" } ---- diff --git a/doc/antora/modules/reference/pages/xlat/protocol.adoc b/doc/antora/modules/reference/pages/xlat/protocol.adoc index dfbf48b6e67..ac31cca2b56 100644 --- a/doc/antora/modules/reference/pages/xlat/protocol.adoc +++ b/doc/antora/modules/reference/pages/xlat/protocol.adoc @@ -50,7 +50,7 @@ It returns the number of attributes which were decoded. .Output ``` -Relay-Agent-Information.Circuit-Id = 0xabcdef, &Relay-Agent-Information.Remote-Id = 0x010203040506 +Relay-Agent-Information.Circuit-Id = 0xabcdef, Relay-Agent-Information.Remote-Id = 0x010203040506 User-Name = "ABCD" ``` @@ -69,8 +69,8 @@ It returns the raw encoded data [source,unlang] ---- -%dhcpv4.encode("&Relay-Agent-Information.Circuit-Id = 0xabcdef, &Relay-Agent-Information.Remote-Id = 0x010203040506") -%radius.encode("&User-Name = 'ABCD'") +%dhcpv4.encode("Relay-Agent-Information.Circuit-Id = 0xabcdef, Relay-Agent-Information.Remote-Id = 0x010203040506") +%radius.encode("User-Name = 'ABCD'") Tmp-Octets-1 := %dhcpv4.encode(&request.Relay-Agent-Information.[*]) ---- diff --git a/doc/antora/modules/tutorials/pages/unlang_policies.adoc b/doc/antora/modules/tutorials/pages/unlang_policies.adoc index e4363ff1baa..2472fa66505 100644 --- a/doc/antora/modules/tutorials/pages/unlang_policies.adoc +++ b/doc/antora/modules/tutorials/pages/unlang_policies.adoc @@ -21,8 +21,8 @@ braces containing the body of the policy ------------------------------------------------ a_policy { - if (&User-Name =~ /@([\w.+])/) { - &reply.Reply-Message := "Hello remote %{User-Name}" + if (User-Name =~ /@([\w.+])/) { + reply.Reply-Message := "Hello remote %{User-Name}" } } ------------------------------------------------ diff --git a/doc/antora/modules/tutorials/pages/virtual.adoc b/doc/antora/modules/tutorials/pages/virtual.adoc index 04bc770a39d..697735299c5 100644 --- a/doc/antora/modules/tutorials/pages/virtual.adoc +++ b/doc/antora/modules/tutorials/pages/virtual.adoc @@ -33,7 +33,7 @@ listen { } authorize { - &control.Clearext-Password := "hello" + control.Clearext-Password := "hello" pap }