dict-ldap: dict_ldap_settings - Rename maps into parsed_maps

diff --git a/src/lib-dict-backend/dict-ldap-settings.c b/src/lib-dict-backend/dict-ldap-settings.c
index 7c9f0127df981fc4d6664a4ad12b469b6d70fbbb..e314ae91c95a2fb401a179928875edee25861341 100644 (file)
--- a/src/lib-dict-backend/dict-ldap-settings.c
+++ b/src/lib-dict-backend/dict-ldap-settings.c
@@ -167,7 +167,7 @@ static const char *dict_ldap_map_finish(struct setting_parser_ctx *ctx)
                if (strchr(ctx->cur_map.pattern, '$') != NULL)
                        return "Missing attributes for pattern variables";
        }
-       array_push_back(&ctx->set->maps, &ctx->cur_map);
+       array_push_back(&ctx->set->parsed_maps, &ctx->cur_map);
        i_zero(&ctx->cur_map);
        return NULL;
 }
@@ -289,7 +289,7 @@ dict_ldap_settings_read(pool_t pool, const char *path, const char **error_r)
        ctx.pool = pool;
        ctx.set = p_new(pool, struct dict_ldap_settings, 1);
        t_array_init(&ctx.cur_attributes, 16);
-       p_array_init(&ctx.set->maps, pool, 8);
+       p_array_init(&ctx.set->parsed_maps, pool, 8);
 
        ctx.set->timeout = 30; /* default timeout */
        ctx.set->require_ssl = FALSE; /* try to start SSL */

diff --git a/src/lib-dict-backend/dict-ldap-settings.h b/src/lib-dict-backend/dict-ldap-settings.h
index 293a9a94dfbe23c0ca4636c18ff3dceb4b907722..399607af3ec2ed82375a4038826f3ed62049ca6b 100644 (file)
--- a/src/lib-dict-backend/dict-ldap-settings.h
+++ b/src/lib-dict-backend/dict-ldap-settings.h
@@ -26,7 +26,7 @@ struct dict_ldap_settings {
        unsigned int debug;
        bool require_ssl;
        bool start_tls;
-       ARRAY(struct dict_ldap_map) maps;
+       ARRAY(struct dict_ldap_map) parsed_maps;
 };
 
 struct dict_ldap_settings *

diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c
index 79210d7418d77e635769bdc69883ea8fc23a6f6f..b65977220a4b9ec45efafffa868b33056a79a9db 100644 (file)
--- a/src/lib-dict-backend/dict-ldap.c
+++ b/src/lib-dict-backend/dict-ldap.c
@@ -110,7 +110,7 @@ ldap_dict_find_map(struct ldap_dict *dict, const char *path,
        unsigned int i, count;
 
        t_array_init(values, 2);
-       maps = array_get(&dict->set->maps, &count);
+       maps = array_get(&dict->set->parsed_maps, &count);
        for (i = 0; i < count; i++) {
                if (dict_ldap_map_match(&maps[i], path, values))
                        return &maps[i];