From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 17 Oct 2011 19:06:48 +0000 (+0200)
Subject: Remove unused configuration parameters
X-Git-Tag: release_3_0_0_beta0~580
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fce8cb2bc4db90987daa04dfc60b8d815ab4ca80;p=thirdparty%2Ffreeradius-server.git

Remove unused configuration parameters
---

diff --git a/src/modules/rlm_sql/conf.h b/src/modules/rlm_sql/conf.h
index d1faae0cd07..50fd1e383de 100644
--- 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 26d7737db85..2fc0684fbb4 100644
--- 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.
 	 */