Replace remaining instances of safe-characters with safe_characters

diff --git a/doc/modules/mschap.rst b/doc/modules/mschap.rst
index a553c13..37fcb9d 100644 (file)
--- a/doc/modules/mschap.rst
+++ b/doc/modules/mschap.rst
@@ -179,7 +179,7 @@ US-ASCII and thus international characters will fail.
 N.B. this could be fixed, if we wanted to pull in something like iconv.
 
 In addition, you should beware of Cleartext-Password when using SQL;
-any password character not in safe-characters will be encoded as a hex
+any password character not in safe_characters will be encoded as a hex
 number, e.g. =20.
 
 Password changes over EAP

diff --git a/raddb/mods-available/expr b/raddb/mods-available/expr
index acf58b7..02591f8 100644 (file)
--- a/raddb/mods-available/expr
+++ b/raddb/mods-available/expr
@@ -22,5 +22,5 @@ expr {
        # Characters that will not be encoded by the %{encode}
        # xlat function.
        # 
-       safe-characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
+       safe_characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
 }

diff --git a/raddb/mods-available/sql b/raddb/mods-available/sql
index df64214..8fcce34 100644 (file)
--- a/raddb/mods-available/sql
+++ b/raddb/mods-available/sql
@@ -136,9 +136,7 @@ sql {
        }
 
        # Set to 'yes' to read radius clients from the database ('nas' table)
-       # Clients will ONLY be read on server startup.  For performance
-       # and security reasons, finding clients via SQL queries CANNOT
-       # be done "live" while the server is running.
+       # Clients will ONLY be read on server startup.
 #      read_clients = yes
 
        # Table to keep radius client info

diff --git a/raddb/mods-config/sql/main/mssql/queries.conf b/raddb/mods-config/sql/main/mssql/queries.conf
index 2b95b1e..f8fcef4 100644 (file)
--- a/raddb/mods-config/sql/main/mssql/queries.conf
+++ b/raddb/mods-config/sql/main/mssql/queries.conf
@@ -7,7 +7,7 @@
        # Safe characters list for sql queries. Everything else is replaced
        # with their mime-encoded equivalents.
        # The default list should be ok
-       #safe-characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
+       #safe_characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
 
        #######################################################################
        #  Query config:  Username

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 7f9c04a..2694230 100644 (file)
--- a/raddb/mods-config/sql/main/mysql/extras/wimax/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/extras/wimax/queries.conf
@@ -7,7 +7,7 @@
 # Safe characters list for sql queries. Everything else is replaced
 # with their mime-encoded equivalents.
 # The default list should be ok
-#safe-characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
+#safe_characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
 
 #######################################################################
 #  Query config:  Username

diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index d2f63d7..6086aa2 100644 (file)
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -7,7 +7,7 @@
        # Safe characters list for sql queries. Everything else is replaced
        # with their mime-encoded equivalents.
        # The default list should be ok
-       #safe-characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
+       #safe_characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
 
        #######################################################################
        #  Connection config

diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index 135d616..c5baf70 100644 (file)
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -7,7 +7,7 @@
        # Safe characters list for sql queries. Everything else is replaced
        # with their mime-encoded equivalents.
        # The default list should be ok
-       # safe-characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
+       # safe_characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
        
        #######################################################################
        #  Query config:  Username

diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index b65b2c4..9580359 100644 (file)
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -7,7 +7,7 @@
        # Safe characters list for sql queries. Everything else is replaced
        # with their mime-encoded equivalents.
        # The default list should be ok
-       #safe-characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
+       #safe_characters = "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"
 
        #######################################################################
        #  Query config:  Username

diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c
index 8364637..0892992 100644 (file)
--- a/src/modules/rlm_expr/rlm_expr.c
+++ b/src/modules/rlm_expr/rlm_expr.c
@@ -442,7 +442,7 @@ static ssize_t urlquote_xlat(UNUSED void *instance, UNUSED REQUEST *request,
 }
 
 /**
- * @brief Equivalent to the old safe-characters functionality in rlm_sql
+ * @brief Equivalent to the old safe_characters functionality in rlm_sql
  *
  * @verbatim Example: "%{escape:<img>foo.jpg</img>}" == "=60img=62foo.jpg=60=/img=62" @endverbatim
  */

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 3d26824..7326e23 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -95,7 +95,7 @@ static const CONF_PARSER module_config[] = {
        {"simul_verify_query", PW_TYPE_STRING_PTR,
         offsetof(rlm_sql_config_t,simul_verify_query), NULL, ""},
 #endif
-       {"safe-characters", PW_TYPE_STRING_PTR | PW_TYPE_DEPRECATED,
+       {"safe_characters", PW_TYPE_STRING_PTR | PW_TYPE_DEPRECATED,
         offsetof(rlm_sql_config_t,allowed_chars), NULL, NULL},
        {"safe_characters", PW_TYPE_STRING_PTR,
         offsetof(rlm_sql_config_t,allowed_chars), NULL,