From: Alan T. DeKok Date: Mon, 9 Oct 2023 13:22:52 +0000 (-0400) Subject: remove alternation X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9865f4d9424f9319b0edfc0c2ccf97ece35220e;p=thirdparty%2Ffreeradius-server.git remove alternation --- diff --git a/raddb/mods-config/sql/ippool/mssql/procedure.sql b/raddb/mods-config/sql/ippool/mssql/procedure.sql index 6d4b45bdaf..1fd07ce871 100644 --- a/raddb/mods-config/sql/ippool/mssql/procedure.sql +++ b/raddb/mods-config/sql/ippool/mssql/procedure.sql @@ -22,7 +22,7 @@ -- @v_gateway = '${gateway}', \ -- @v_owner = '${owner}', \ -- @v_lease_duration = ${offer_duration}, \ --- @v_requested_address = '%{${requested_address}:-0.0.0.0}' \ +-- @v_requested_address = '%{${requested_address} || 0.0.0.0}' \ -- " -- allocate_update = "" -- allocate_commit = "" diff --git a/raddb/mods-config/sql/ippool/mssql/queries.conf b/raddb/mods-config/sql/ippool/mssql/queries.conf index 6e0dd94145..ce95501d50 100644 --- a/raddb/mods-config/sql/ippool/mssql/queries.conf +++ b/raddb/mods-config/sql/ippool/mssql/queries.conf @@ -47,7 +47,7 @@ alloc_requested = "\ FROM ${ippool_table} WITH (xlock rowlock readpast) \ JOIN fr_ippool_status ON ${ippool_table}.status_id = fr_ippool_status.status_id \ WHERE pool_name = '%{control.${pool_name}}' \ - AND address = '%{${requested_address}:-0.0.0.0}' \ + AND address = '%{${requested_address} || 0.0.0.0}' \ AND fr_ippool_status.status = 'dynamic' \ AND expiry_time < CURRENT_TIMESTAMP \ ) \ @@ -105,7 +105,7 @@ alloc_find = "\ # (SELECT TOP(1) id, 2 AS o FROM ${ippool_table} WITH (xlock rowlock readpast) \ # JOIN fr_ippool_status ON ${ippool_table}.status_id = fr_ippool_status.status_id \ # WHERE pool_name = '%{control.${pool_name}}' \ -# AND address = '%{${requested_address}:-0.0.0.0}' \ +# AND address = '%{${requested_address} || 0.0.0.0}' \ # AND fr_ippool_status.status = 'dynamic' \ # AND expiry_time < CURRENT_TIMESTAMP ) \ # UNION \ @@ -169,7 +169,7 @@ pool_check = "\ # @v_gateway = '${gateway}', \ # @v_owner = '${owner}', \ # @v_lease_duration = ${offer_duration}, \ -# @v_requested_address = '%{${requested_address}:-0.0.0.0}' +# @v_requested_address = '%{${requested_address} || 0.0.0.0}' # " #alloc_update = "" #alloc_commit = "" diff --git a/raddb/mods-config/sql/ippool/mysql/procedure.sql b/raddb/mods-config/sql/ippool/mysql/procedure.sql index 1a05bf9912..328132eab0 100644 --- a/raddb/mods-config/sql/ippool/mysql/procedure.sql +++ b/raddb/mods-config/sql/ippool/mysql/procedure.sql @@ -22,7 +22,7 @@ -- '${gateway}', \ -- '${owner}', \ -- ${offer_duration}, \ --- '%{${requested_address}:-0.0.0.0}' \ +-- '%{${requested_address} || 0.0.0.0}' \ -- )" -- allocate_update = "" -- allocate_commit = "" diff --git a/raddb/mods-config/sql/ippool/mysql/queries.conf b/raddb/mods-config/sql/ippool/mysql/queries.conf index 15fec59aa4..a84293db73 100644 --- a/raddb/mods-config/sql/ippool/mysql/queries.conf +++ b/raddb/mods-config/sql/ippool/mysql/queries.conf @@ -40,7 +40,7 @@ alloc_requested = "\ SELECT address \ FROM ${ippool_table} \ WHERE pool_name = '%{control.${pool_name}}' \ - AND address = '%{${requested_address}:-0.0.0.0}' \ + AND address = '%{${requested_address} || 0.0.0.0}' \ AND `status` = 'dynamic' \ AND expiry_time < NOW() \ FOR UPDATE ${skip_locked}" @@ -72,7 +72,7 @@ alloc_find = "\ # ) UNION ( \ # SELECT address, 2 AS o FROM ${ippool_table} \ # WHERE pool_name = '%{control.${pool_name}}' \ -# AND address = '%{${requested_address}:-0.0.0.0}' \ +# AND address = '%{${requested_address} || 0.0.0.0}' \ # AND `status` = 'dynamic' \ # AND expiry_time < NOW() \ # FOR UPDATE SKIP LOCKED \ @@ -132,7 +132,7 @@ alloc_update = "\ # '${gateway}', \ # '${owner}', \ # ${offer_duration}, \ -# '%{${requested_address}:-0.0.0.0}' +# '%{${requested_address} || 0.0.0.0}' # )" #alloc_update = "" #alloc_commit = "" diff --git a/raddb/mods-config/sql/ippool/oracle/procedure.sql b/raddb/mods-config/sql/ippool/oracle/procedure.sql index 5f45d9baa5..9df12eb38a 100644 --- a/raddb/mods-config/sql/ippool/oracle/procedure.sql +++ b/raddb/mods-config/sql/ippool/oracle/procedure.sql @@ -22,7 +22,7 @@ -- '${gateway}', \ -- '${owner}', \ -- ${offer_duration}, \ --- '%{${requested_address}:-0.0.0.0}' +-- '%{${requested_address} || 0.0.0.0}' -- ) FROM dual" -- allocate_update = "" -- allocate_commit = "" diff --git a/raddb/mods-config/sql/ippool/oracle/queries.conf b/raddb/mods-config/sql/ippool/oracle/queries.conf index 7c5cc4d7aa..fbc9d2d844 100644 --- a/raddb/mods-config/sql/ippool/oracle/queries.conf +++ b/raddb/mods-config/sql/ippool/oracle/queries.conf @@ -27,7 +27,7 @@ alloc_find = "\ '${gateway}', \ '${owner}', \ '${offer_duration}', \ - '%{${requested_address}:-0.0.0.0}' + '%{${requested_address} || 0.0.0.0}' ) FROM dual" alloc_update = "" alloc_commit = "" diff --git a/raddb/mods-config/sql/ippool/postgresql/procedure.sql b/raddb/mods-config/sql/ippool/postgresql/procedure.sql index 9b3d074380..2aa580d9f2 100644 --- a/raddb/mods-config/sql/ippool/postgresql/procedure.sql +++ b/raddb/mods-config/sql/ippool/postgresql/procedure.sql @@ -22,7 +22,7 @@ -- '${gateway}', \ -- '${owner}', \ -- ${offer_duration}, \ --- '%{${requested_address}:-0.0.0.0}' \ +-- '%{${requested_address} || 0.0.0.0}' \ -- )" -- allocate_update = "" -- allocate_commit = "" diff --git a/raddb/mods-config/sql/ippool/postgresql/queries.conf b/raddb/mods-config/sql/ippool/postgresql/queries.conf index d37f2e2948..9af5935eca 100644 --- a/raddb/mods-config/sql/ippool/postgresql/queries.conf +++ b/raddb/mods-config/sql/ippool/postgresql/queries.conf @@ -53,7 +53,7 @@ alloc_requested = "\ SELECT address \ FROM ${ippool_table} \ WHERE pool_name = '%{control.${pool_name}}' \ - AND address = '%{${requested_address}:-0.0.0.0}' \ + AND address = '%{${requested_address} || 0.0.0.0}' \ AND expiry_time < 'now'::timestamp(0) \ AND status = 'dynamic' \ FOR UPDATE ${skip_locked} \ @@ -152,7 +152,7 @@ pool_check = "\ # '${gateway}', \ # '${owner}', \ # '${offer_duration}', \ -# '%{${requested_address}:-0.0.0.0}' \ +# '%{${requested_address} || 0.0.0.0}' \ # )" #alloc_update = "" #alloc_commit = "" diff --git a/raddb/mods-config/sql/ippool/sqlite/queries.conf b/raddb/mods-config/sql/ippool/sqlite/queries.conf index 90026a95b0..ba4ab2c4cf 100644 --- a/raddb/mods-config/sql/ippool/sqlite/queries.conf +++ b/raddb/mods-config/sql/ippool/sqlite/queries.conf @@ -52,7 +52,7 @@ alloc_requested = "SELECT address \ JOIN fr_ippool_status \ ON ${ippool_table}.status_id = fr_ippool_status.status_id \ WHERE pool_name = '%{control.${pool_name}}' \ - AND address = '%{${requested_address}:-0.0.0.0}' \ + AND address = '%{${requested_address} || 0.0.0.0}' \ AND status = 'dynamic' \ AND expiry_time < datetime('now')" diff --git a/raddb/mods-config/sql/main/mysql/extras/wimax/queries.conf b/raddb/mods-config/sql/main/mysql/extras/wimax/queries.conf index ed902410dd..56d3c061a8 100644 --- a/raddb/mods-config/sql/main/mysql/extras/wimax/queries.conf +++ b/raddb/mods-config/sql/main/mysql/extras/wimax/queries.conf @@ -22,7 +22,7 @@ # Use Stripped-User-Name, if it's there. # Else use User-Name, if it's there, # Else use hard-coded string "DEFAULT" as the user name. -#sql_user_name = "%{%{Stripped-User-Name}:-%{&User-Name || DEFAULT}}" +#sql_user_name = "%{&Stripped-User-Name} || &User-Name || 'DEFAULT'}}" # sql_user_name = "%{User-Name}" diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf index 8961da306c..392970fb19 100644 --- a/raddb/mods-config/sql/main/sqlite/queries.conf +++ b/raddb/mods-config/sql/main/sqlite/queries.conf @@ -22,7 +22,7 @@ # Use Stripped-User-Name, if it's there. # Else use User-Name, if it's there, # Else use hard-coded string "DEFAULT" as the user name. -#sql_user_name = "%{%{Stripped-User-Name}:-%{&User-Name || DEFAULT}}" +#sql_user_name = "%{&Stripped-User-Name || &User-Name || 'DEFAULT'}" # sql_user_name = "%{User-Name}" diff --git a/raddb/policy.d/cui b/raddb/policy.d/cui index 6d0419a5b1..c70952d92f 100644 --- a/raddb/policy.d/cui +++ b/raddb/policy.d/cui @@ -54,7 +54,7 @@ cui.authorize { cui.post-auth { if (!&control.Proxy-To-Realm && &Chargeable-User-Identity && !&reply.Chargeable-User-Identity && (&Operator-Name || ('${policy.cui_require_operator_name}' != 'yes')) ) { - &reply.Chargeable-User-Identity = "%sha1(${policy.cui_hash_key}%tolower(%{User-Name}%{%{Operator-Name}:-}))" + &reply.Chargeable-User-Identity = "%sha1(${policy.cui_hash_key}%tolower(%{User-Name}%{&Operator-Name || ''}))" } # @@ -77,7 +77,7 @@ cui.post-auth { cui-inner.post-auth { if (&outer.request.Chargeable-User-Identity && \ (&outer.request.Operator-Name || ('${policy.cui_require_operator_name}' != 'yes'))) { - &reply.Chargeable-User-Identity := "%sha1(${policy.cui_hash_key}%tolower(%{User-Name}%{%{outer.request.Operator-Name}:-}))" + &reply.Chargeable-User-Identity := "%sha1(${policy.cui_hash_key}%tolower(%{User-Name}%{&outer.request.Operator-Name || ''}))" } }