From 897eeae1e68cb04625b96d62729383fb849926a0 Mon Sep 17 00:00:00 2001 From: Marco Bettini Date: Fri, 20 Sep 2024 13:08:56 +0000 Subject: [PATCH] lib-ldap: ldap_client_settings - Rename password into auth_dn_password --- src/lib-dict-backend/dict-ldap.c | 2 +- src/lib-ldap/ldap-client.h | 2 +- src/lib-ldap/ldap-connection.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c index 234ead8602..7e97ac6de3 100644 --- a/src/lib-dict-backend/dict-ldap.c +++ b/src/lib-dict-backend/dict-ldap.c @@ -125,7 +125,7 @@ int dict_ldap_connect(struct ldap_dict *dict, const char **error_r) i_zero(&set); set.uri = dict->set->uri; set.bind_dn = dict->set->bind_dn; - set.password = dict->set->password; + set.auth_dn_password = dict->set->password; set.timeout_secs = dict->set->timeout; set.max_idle_time_secs = dict->set->max_idle_time; set.debug = dict->set->debug; diff --git a/src/lib-ldap/ldap-client.h b/src/lib-ldap/ldap-client.h index aa998dba19..193b3d3f99 100644 --- a/src/lib-ldap/ldap-client.h +++ b/src/lib-ldap/ldap-client.h @@ -23,7 +23,7 @@ struct ldap_client_settings { ldap_connection_have_settings() and ldap_connection_init() */ const char *uri; const char *bind_dn; - const char *password; + const char *auth_dn_password; struct event *event_parent; const struct ssl_iostream_settings *ssl_set; diff --git a/src/lib-ldap/ldap-connection.c b/src/lib-ldap/ldap-connection.c index d12b7d3d4e..6fc28c29c4 100644 --- a/src/lib-ldap/ldap-connection.c +++ b/src/lib-ldap/ldap-connection.c @@ -123,7 +123,7 @@ bool ldap_connection_have_settings(struct ldap_connection *conn, return FALSE; if (null_strcmp(conn_set->bind_dn, set->bind_dn) != 0) return FALSE; - if (null_strcmp(conn_set->password, set->password) != 0) + if (null_strcmp(conn_set->auth_dn_password, set->auth_dn_password) != 0) return FALSE; if (conn_set->timeout_secs != set->timeout_secs || conn_set->max_idle_time_secs != set->max_idle_time_secs || @@ -177,9 +177,9 @@ int ldap_connection_init(struct ldap_client *client, /* deep copy relevant strings */ conn->set.uri = p_strdup(pool, set->uri); conn->set.bind_dn = p_strdup(pool, set->bind_dn); - if (*set->password != '\0') { - conn->set.password = p_strdup(pool, set->password); - ber_str2bv(conn->set.password, strlen(conn->set.password), 0, &conn->cred); + if (*set->auth_dn_password != '\0') { + conn->set.auth_dn_password = p_strdup(pool, set->auth_dn_password); + ber_str2bv(conn->set.auth_dn_password, strlen(conn->set.auth_dn_password), 0, &conn->cred); } /* cannot use these */ i_zero(&conn->ssl_set.ca); -- 2.47.3