From: Jorge Pereira Date: Tue, 16 Aug 2022 00:55:17 +0000 (-0300) Subject: More "update {....}" to edit against raddb/mods-* X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4af935cb5b9cd1ffc6e030d9425cec1dec9e65f7;p=thirdparty%2Ffreeradius-server.git More "update {....}" to edit against raddb/mods-* --- diff --git a/raddb/mods-available/cache b/raddb/mods-available/cache index 46665b5a688..569e6b5d5fa 100644 --- a/raddb/mods-available/cache +++ b/raddb/mods-available/cache @@ -316,9 +316,7 @@ cache { # # ``` # # Add a cache entry - # update { - # &control.Cache-TTL := 3600 # 1h - # } + # &control.Cache-TTL := 1h # cache.store # if (updated) { # ..keys stored @@ -337,9 +335,7 @@ cache { # } # # # Change the entries TTL - # update { - # &control.Cache-TTL := 1600 # 30m - # } + # &control.Cache-TTL := 30m # cache.ttl # if (updated) { # ..ttl changed diff --git a/raddb/mods-available/json b/raddb/mods-available/json index c6c2fd88486..5bfad2bbb3d 100644 --- a/raddb/mods-available/json +++ b/raddb/mods-available/json @@ -174,12 +174,8 @@ json { # # [source,unlang] # ---- -# update control { -# &Tmp-String-0 := '$.my.json.payload[1]' -# } -# update reply { -# &Reply-Message := "Validation of %{control.Tmp-String-0} is %{jpathvalidate:$.my.json.payload[1]}" -# } +# &control.Tmp-String-0 := '$.my.json.payload[1]' +# &reply.Reply-Message := "Validation of %{control.Tmp-String-0} is %{jpathvalidate:$.my.json.payload[1]}" # ---- # # .Output @@ -198,12 +194,8 @@ json { # # [source,unlang] # ---- -# update control { -# &Tmp-String-0 := "caipirinha/gelada" -# } -# update reply { -# &Reply-Message := "The string %{control.Tmp-String-0} should be %{jsonquote:%{control.Tmp-String-0}} to be a valid JSON string." -# } +# &control.Tmp-String-0 := "caipirinha/gelada" +# &reply.Reply-Message := "The string %{control.Tmp-String-0} should be %{jsonquote:%{control.Tmp-String-0}} to be a valid JSON string." # ---- # # .Output diff --git a/raddb/mods-available/ldap b/raddb/mods-available/ldap index eac37631a2b..dae45100c2a 100644 --- a/raddb/mods-available/ldap +++ b/raddb/mods-available/ldap @@ -224,9 +224,7 @@ ldap { # ---- # ldap # if ((ok || updated) && &User-Password) { - # update { - # &control.Auth-Type := ldap - # } + # &control.Auth-Type := ldap # } # ---- # ==== diff --git a/raddb/mods-available/radius b/raddb/mods-available/radius index c41430a5744..3215ac13ea5 100644 --- a/raddb/mods-available/radius +++ b/raddb/mods-available/radius @@ -128,14 +128,12 @@ radius { # type = Status-Server - # - # update request { ... }:: # # `Status-Server` packet contents are fixed and cannot # be edited. # - # For other packet types, you can create the contents - # here. The section MUST be "update request", and + # For other packet types, you can set the contents + # here. The section MUST be set over "&request. = value", and # anything else will cause a parse error. # # We RECOMMEND that you use packet contents which @@ -155,12 +153,10 @@ radius { # created when a connection is opened, and are not # changeable after that. # -# update request { -# &User-Name := "test-user" -# &User-Password := "this-is-not-a-real-password" -# &NAS-Identifier := "Status check. Are you alive?" -# &Event-Timestamp = 0 -# } +# &request.User-Name := "test-user" +# &request.User-Password := "this-is-not-a-real-password" +# &request.NAS-Identifier := "Status check. Are you alive?" +# &request.Event-Timestamp = 0 } diff --git a/raddb/mods-available/redundant_sql b/raddb/mods-available/redundant_sql index bb1c90135f0..23efaf98f65 100644 --- a/raddb/mods-available/redundant_sql +++ b/raddb/mods-available/redundant_sql @@ -33,9 +33,7 @@ # it will be `redundant_sql`. You can then use this expansion # just like any other: # -# update reply { -# Filter-Id := "%{redundant_sql: ... }" -# } +# &reply.Filter-Id := "%{redundant_sql: ... }" # # In this example, the expansion is done via module `sql1`, and if # that expansion fails, using module `sql2`. diff --git a/raddb/mods-config/perl/example.pl b/raddb/mods-config/perl/example.pl index 7b9b3a79dd3..3fa1467467f 100644 --- a/raddb/mods-config/perl/example.pl +++ b/raddb/mods-config/perl/example.pl @@ -49,9 +49,9 @@ our (%RAD_REQUEST, %RAD_REPLY, %RAD_CONFIG, %RAD_STATE); # Multi-value attributes are mapped to perl arrayrefs. # -# update request { -# Filter-Id := 'foo' -# Filter-Id += 'bar' +# &request.Filter-Id := 'foo' +# &request += { +# &Filter-Id = 'bar' # } # # This results to the following entry in %RAD_REQUEST: