Remove unused configuration parameters

diff --git a/src/modules/rlm_sql/conf.h b/src/modules/rlm_sql/conf.h
index d1faae0cd077d3df7a28b3cf418fc00bdd896fb4..50fd1e383deaf3294a6f0ceb68b8e3690b5b3388 100644 (file)
--- a/src/modules/rlm_sql/conf.h
+++ b/src/modules/rlm_sql/conf.h
@@ -42,10 +42,6 @@ typedef struct sql_config {
        char   *tracefile;
        char   *xlat_name;
        int     deletestalesessions;
-       int     num_sql_socks;
-       int     lifetime;
-       int     max_queries;
-       int     connect_failure_retry_delay;
        char   *postauth_query;
        char   *allowed_chars;
        int     query_timeout;
@@ -89,7 +85,6 @@ typedef struct sql_config {
 #define SQL_DOWN                       1 /* for re-connect */
 
 #define MAX_COMMUNITY_LEN              50
-#define MAX_SQL_SOCKS                  256
 #define MAX_TABLE_LEN                  20
 #define MAX_AUTH_QUERY_LEN             256
 #define AUTH_STRING_LEN                        128

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 26d7737db856782049abd0544858a46fe7a246f4..2fc0684fbb4f6ad621ae54cb983e4e1eb2d065d6 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -61,12 +61,6 @@ static const CONF_PARSER module_config[] = {
         offsetof(SQL_CONFIG,do_clients), NULL, "no"},
        {"deletestalesessions", PW_TYPE_BOOLEAN,
         offsetof(SQL_CONFIG,deletestalesessions), NULL, "yes"},
-       {"num_sql_socks", PW_TYPE_INTEGER,
-        offsetof(SQL_CONFIG,num_sql_socks), NULL, "5"},
-       {"lifetime", PW_TYPE_INTEGER,
-        offsetof(SQL_CONFIG,lifetime), NULL, "0"},
-       {"max_queries", PW_TYPE_INTEGER,
-        offsetof(SQL_CONFIG,max_queries), NULL, "0"},
        {"sql_user_name", PW_TYPE_STRING_PTR,
         offsetof(SQL_CONFIG,query_user), NULL, ""},
        {"default_user_profile", PW_TYPE_STRING_PTR,
@@ -99,8 +93,6 @@ static const CONF_PARSER module_config[] = {
 #endif
        {"group_membership_query", PW_TYPE_STRING_PTR,
         offsetof(SQL_CONFIG,groupmemb_query), NULL, NULL},
-       {"connect_failure_retry_delay", PW_TYPE_INTEGER,
-        offsetof(SQL_CONFIG,connect_failure_retry_delay), NULL, "60"},
 #ifdef WITH_SESSION_MGMT
        {"simul_count_query", PW_TYPE_STRING_PTR,
         offsetof(SQL_CONFIG,simul_count_query), NULL, ""},
@@ -930,13 +922,6 @@ static int rlm_sql_instantiate(CONF_SECTION * conf, void **instance)
                xlat_register(xlat_name, (RAD_XLAT_FUNC)sql_xlat, inst);
        }
 
-       if (inst->config->num_sql_socks > MAX_SQL_SOCKS) {
-               radlog(L_ERR, "rlm_sql (%s): sql_instantiate: number of sqlsockets cannot exceed MAX_SQL_SOCKS, %d",
-                      inst->config->xlat_name, MAX_SQL_SOCKS);
-               rlm_sql_detach(inst);
-               return -1;
-       }
-
        /*
         *      Sanity check for crazy people.
         */