From 3683f7cae4dddc8c2ae2e623a8659889eecc29d8 Mon Sep 17 00:00:00 2001 From: Marco Bettini Date: Wed, 10 Jul 2024 08:11:42 +0000 Subject: [PATCH] auth: ldap_set_attrs() - pass directly pool_t rather than ldap_connection --- src/auth/db-ldap.c | 6 +++--- src/auth/db-ldap.h | 2 +- src/auth/passdb-ldap.c | 2 +- src/auth/userdb-ldap.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c index 4201956226..06459780ca 100644 --- a/src/auth/db-ldap.c +++ b/src/auth/db-ldap.c @@ -1072,7 +1072,7 @@ db_ldap_field_find(const char *data, void *context, return 1; } -void db_ldap_get_attribute_names(struct ldap_connection *conn, +void db_ldap_get_attribute_names(pool_t pool, const ARRAY_TYPE(const_string) *attrlist, char ***attr_names_r, const char *skip_attr) @@ -1087,8 +1087,8 @@ void db_ldap_get_attribute_names(struct ldap_connection *conn, i_assert(count % 2 == 0); struct ldap_field_find_context ctx; - ctx.pool = conn->pool; - p_array_init(&ctx.attr_names, conn->pool, count / 2); + ctx.pool = pool; + p_array_init(&ctx.attr_names, pool, count / 2); string_t *tmp_str = t_str_new(128); for (unsigned int index = 0; index < count; ) { diff --git a/src/auth/db-ldap.h b/src/auth/db-ldap.h index 235dd00869..46000f210b 100644 --- a/src/auth/db-ldap.h +++ b/src/auth/db-ldap.h @@ -154,7 +154,7 @@ extern const struct var_expand_func_table db_ldap_field_expand_fn_table[]; void db_ldap_request(struct ldap_connection *conn, struct ldap_request *request); -void db_ldap_get_attribute_names(struct ldap_connection *conn, +void db_ldap_get_attribute_names(pool_t pool, const ARRAY_TYPE(const_string) *attrlist, char ***attr_names_r, const char *skip_attr) ATTR_NULL(4); diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c index 1e0dd1a785..1775b46169 100644 --- a/src/auth/passdb-ldap.c +++ b/src/auth/passdb-ldap.c @@ -440,7 +440,7 @@ static int passdb_ldap_preinit(pool_t pool, struct event *event, module = p_new(pool, struct ldap_passdb_module, 1); module->conn = conn = db_ldap_init(event); - db_ldap_get_attribute_names(conn, &auth_post->fields, + db_ldap_get_attribute_names(conn->pool, &auth_post->fields, &conn->pass_attr_names, ldap_pre->passdb_ldap_bind ? "password" : NULL); diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c index b2a05dd276..dea36130c2 100644 --- a/src/auth/userdb-ldap.c +++ b/src/auth/userdb-ldap.c @@ -326,9 +326,9 @@ static int userdb_ldap_preinit(pool_t pool, struct event *event, module = p_new(pool, struct ldap_userdb_module, 1); module->conn = conn = db_ldap_init(event); - db_ldap_get_attribute_names(conn, &auth_post->fields, + db_ldap_get_attribute_names(conn->pool, &auth_post->fields, &conn->user_attr_names, NULL); - db_ldap_get_attribute_names(conn, &ldap_post->iterate_fields, + db_ldap_get_attribute_names(conn->pool, &ldap_post->iterate_fields, &conn->iterate_attr_names, NULL); module->module.default_cache_key = auth_cache_parse_key_and_fields( -- 2.47.3