remove alternation

diff --git a/raddb/mods-config/sql/ippool/mssql/procedure.sql b/raddb/mods-config/sql/ippool/mssql/procedure.sql
index 6d4b45bdafdfa42ddd69e413a6ced7e4fe237fbb..1fd07ce87166e3a3127b8aadda065b69af9e15f6 100644 (file)
--- 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 6e0dd941457cc64797357b04a58fb7d5e98c1783..ce95501d50797c64e69ae2c203523103044be867 100644 (file)
--- 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 1a05bf99129a71a6600570a981050cfa62307ff4..328132eab06aad1180fc6118235e0c64880579ce 100644 (file)
--- 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 15fec59aa4eda48434cb947aad6120161cf4cd86..a84293db73a9101cede8c6edc192cfb37702ebd8 100644 (file)
--- 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 5f45d9baa56180c26261e26f276a788b7213390a..9df12eb38a021e422708ec16c887993ff1fd60b5 100644 (file)
--- 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 7c5cc4d7aac17cfaedc4fe4a5945fcea7cf38bff..fbc9d2d8443e98f3ce2b2f26a32432055c715b5d 100644 (file)
--- 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 9b3d0743809d603c903f6353a487dd685823b18a..2aa580d9f2742a8320b227d75d597d3eef98e803 100644 (file)
--- 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 d37f2e2948cab607b6c496dde4e427732028c9c9..9af5935eca0d3170a53071439dd490b9ac103ceb 100644 (file)
--- 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 90026a95b0721f2d16a06faf9d1a49f74182984e..ba4ab2c4cfa72c69fb85183489383f22b2f37332 100644 (file)
--- 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 ed902410dd43f2865d46af5f388fa00780e1d59a..56d3c061a85fd066c61aacea637c1c98f3399252 100644 (file)
--- 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 8961da306ca786a6152d32af26af1e4c6d395937..392970fb1902f5c23ca70d4b86fb366732248244 100644 (file)
--- 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 6d0419a5b1c8f78ee81052c0ed47de62bff3ae33..c70952d92f1e680c7a46382f307434fbef45e14a 100644 (file)
--- 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 || ''}))"
        }
 }