From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 19 Jun 2015 00:25:43 +0000 (-0400)
Subject: Use correct type for sql_port
X-Git-Tag: release_3_0_9~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8de25d9bb6bfc4f61dd4602d8b438e75fb2cb3e;p=thirdparty%2Ffreeradius-server.git

Use correct type for sql_port
---

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 3991fd0d2e4..4b947e2054b 100644
--- 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
@@ -246,7 +246,7 @@ static sql_rcode_t sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *c
 					config->sql_login,
 					config->sql_password,
 					config->sql_db,
-					atoi(config->sql_port),
+					config->sql_port,
 					NULL,
 					sql_flags);
 	if (!conn->sock) {
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 bbb91c569b4..631361d7df7 100644
--- 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
@@ -109,8 +109,8 @@ static int mod_instantiate(CONF_SECTION *conf, rlm_sql_config_t *config)
 		db_string = talloc_asprintf_append(db_string, " host='%s'", config->sql_server);
 	}
 
-	if (config->sql_port[0] != '\0') {
-		db_string = talloc_asprintf_append(db_string, " port=%s", config->sql_port);
+	if (config->sql_port) {
+		db_string = talloc_asprintf_append(db_string, " port=%i", config->sql_port);
 	}
 
 	if (config->sql_login[0] != '\0') {
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 64f91bdd89c..225719a4e2c 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -82,7 +82,7 @@ static const CONF_PARSER postauth_config[] = {
 static const CONF_PARSER module_config[] = {
 	{ "driver", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_sql_config_t, sql_driver_name), "rlm_sql_null" },
 	{ "server", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_sql_config_t, sql_server), "localhost" },
-	{ "port", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_sql_config_t, sql_port), "" },
+	{ "port", FR_CONF_OFFSET(PW_TYPE_INTEGER, rlm_sql_config_t, sql_port), "0" },
 	{ "login", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_sql_config_t, sql_login), "" },
 	{ "password", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_SECRET, rlm_sql_config_t, sql_password), "" },
 	{ "radius_db", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_sql_config_t, sql_db), "radius" },
diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index c74d7e07962..84dc85dff94 100644
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -83,7 +83,7 @@ typedef struct sql_acct_section {
 typedef struct sql_config {
 	char const 		*sql_driver_name;		//!< SQL driver module name e.g. rlm_sql_sqlite.
 	char const 		*sql_server;			//!< Server to connect to.
-	char const 		*sql_port;			//!< Port to connect to.
+	uint32_t 		*sql_port;			//!< Port to connect to.
 	char const 		*sql_login;			//!< Login credentials to use.
 	char const 		*sql_password;			//!< Login password to use.
 	char const 		*sql_db;			//!< Database to run queries against.