dict-ldap: dict_ldap_settings - Drop max_attribute_count

diff --git a/src/lib-dict-backend/dict-ldap-settings.c b/src/lib-dict-backend/dict-ldap-settings.c
index 4f807a5bab8cf51ca43ee7d56361e7d317483440..7c9f0127df981fc4d6664a4ad12b469b6d70fbbb 100644 (file)
--- a/src/lib-dict-backend/dict-ldap-settings.c
+++ b/src/lib-dict-backend/dict-ldap-settings.c
@@ -127,8 +127,6 @@ static const char *dict_ldap_attributes_map(struct setting_parser_ctx *ctx)
                }
        }
 
-       if (ctx->set->max_attribute_count < count)
-               ctx->set->max_attribute_count = count;
        ctx->cur_map.pattern = p_strdup(ctx->pool, str_c(pattern));
        return NULL;
 }

diff --git a/src/lib-dict-backend/dict-ldap-settings.h b/src/lib-dict-backend/dict-ldap-settings.h
index 0919ca9d6ddf9fa105cc72c29d1a156061b89369..293a9a94dfbe23c0ca4636c18ff3dceb4b907722 100644 (file)
--- a/src/lib-dict-backend/dict-ldap-settings.h
+++ b/src/lib-dict-backend/dict-ldap-settings.h
@@ -24,7 +24,6 @@ struct dict_ldap_settings {
        unsigned int timeout;
        unsigned int max_idle_time;
        unsigned int debug;
-       unsigned int max_attribute_count;
        bool require_ssl;
        bool start_tls;
        ARRAY(struct dict_ldap_map) maps;

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