allow queries to proceed in CONNECTING or CONNECTED states

instead of checking for a failure state, and missing some
failure states

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index a2b374a4d0af7881544fd6750422238e40e9ad3c..a704857c190ecbf227341fb884b1f65c9a7c2a74 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -855,7 +855,7 @@ static ssize_t sql_escape_func(request_t *request, char *out, size_t outlen, cha
        rlm_sql_mysql_conn_t    *c;
        char const              *log_prefix = conn->name;
 
-       if ((conn->state == CONNECTION_STATE_HALTED) || (conn->state == CONNECTION_STATE_CLOSED)) {
+       if (!((conn->state == CONNECTION_STATE_CONNECTING) || (conn->state == CONNECTION_STATE_CONNECTED))) {
                ROPTIONAL(RERROR, ERROR, "Connection not available for escaping");
                return -1;
        }

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
index 3b67c56102e9ecb99dc188eb065eaa5428dee215..261cefc8b5a0eeb0919ea62c481e3a933fa82f3e 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
@@ -700,7 +700,7 @@ static ssize_t sql_escape_func(request_t *request, char *out, size_t outlen, cha
        rlm_sql_postgres_conn_t *c;
        int                     err;
 
-       if ((conn->state == CONNECTION_STATE_HALTED) || (conn->state == CONNECTION_STATE_CLOSED)) {
+       if (!((conn->state == CONNECTION_STATE_CONNECTING) || (conn->state == CONNECTION_STATE_CONNECTED))) {
                ROPTIONAL(RERROR, ERROR, "Connection not available for escaping");
                return -1;
        }