s/config_server/server_str/

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index dc1b78f759af9a6ed35c4e6bf51e8e7712012724..1ee4e7f1a5cd056242c283356c7c67f3752cb2f4 100644 (file)
--- 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 14092cbbd002ff7e089e08eafb2b71d3a2c50332..574bbbf3bb804d3c75c65fe067f697995bfc5588 100644 (file)
--- 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.