Added query_timeout parameter. For now, it does nothing.

It is therefore not documented, either.

diff --git a/src/modules/rlm_sql/conf.h b/src/modules/rlm_sql/conf.h
index 98307ad72e98cbbb9ceca7095489e1ecdb488b31..7d28f7746abc8e4d390b0b2cb160eddac8e39e85 100644 (file)
--- a/src/modules/rlm_sql/conf.h
+++ b/src/modules/rlm_sql/conf.h
@@ -47,6 +47,7 @@ typedef struct sql_config {
        int     connect_failure_retry_delay;
        char   *postauth_query;
        char   *allowed_chars;
+       int     query_timeout;
 
        /* individual driver config */
        void    *localcfg;

diff --git a/src/modules/rlm_sql/drivers/lib/.gitignore b/src/modules/rlm_sql/drivers/lib/.gitignore
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/src/modules/rlm_sql/drivers/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index abcea04138b86ba8e37d2c5cd0425622a9ff61cd..7ce0064fe76dc44be14ccae95dca0dabf3643f73 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -108,6 +108,12 @@ static const CONF_PARSER module_config[] = {
         offsetof(SQL_CONFIG,allowed_chars), NULL,
        "@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /"},
 
+       /*
+        *      This only works for a few drivers.
+        */
+       {"query_timeout", PW_TYPE_INTEGER,
+        offsetof(SQL_CONFIG,query_timeout), NULL, NULL},
+        
        {NULL, -1, 0, NULL, NULL}
 };