From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 30 Nov 2016 21:02:53 +0000 (-0500)
Subject: s/config_server/server_str/
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf28e84e7957ef7a0d57f70d4fb4b0d587dceb08;p=thirdparty%2Ffreeradius-server.git

s/config_server/server_str/
---

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index dc1b78f759a..1ee4e7f1a5c 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -229,7 +229,7 @@ static const CONF_PARSER module_config[] = {
 	/*
 	 *	Pool config items
 	 */
-	{ FR_CONF_OFFSET("server", PW_TYPE_STRING | PW_TYPE_MULTI, rlm_ldap_t, pool_inst.config_server) },	/* Do not set to required */
+	{ FR_CONF_OFFSET("server", PW_TYPE_STRING | PW_TYPE_MULTI, rlm_ldap_t, pool_inst.server_str) },	/* Do not set to required */
 
 	{ FR_CONF_OFFSET("port", PW_TYPE_SHORT, rlm_ldap_t, pool_inst.port) },
 
@@ -1516,7 +1516,7 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 	 *	connection pool.
 	 */
 	if (!cf_pair_find(conf, "pool")) {
-		if (!inst->pool_inst.config_server) {
+		if (!inst->pool_inst.server_str) {
 			cf_log_err_cs(conf, "Configuration item 'server' must have a value");
 			goto error;
 		}
@@ -1555,8 +1555,8 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 	/*
 	 *	Now iterate over all the 'server' config items
 	 */
-	for (i = 0; i < talloc_array_length(inst->pool_inst.config_server); i++) {
-		char const *value = inst->pool_inst.config_server[i];
+	for (i = 0; i < talloc_array_length(inst->pool_inst.server_str); i++) {
+		char const *value = inst->pool_inst.server_str[i];
 		size_t j;
 
 		/*
diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h
index 14092cbbd00..574bbbf3bb8 100644
--- a/src/modules/rlm_ldap/rlm_ldap.h
+++ b/src/modules/rlm_ldap/rlm_ldap.h
@@ -194,7 +194,7 @@ typedef struct ldap_directory {
  */
 typedef struct {
 	char		*server;			//!< Initial server to bind to.
-	char const	**config_server;		//!< Server set in the config.
+	char const	**server_str;		//!< Server set in the config.
 
 	uint16_t	port;				//!< Port to use when binding to the server.