From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Fri, 20 Sep 2024 13:23:20 +0000 (+0000)
Subject: lib-ldap: ldap_client_settings - Rename debug into debug_level
X-Git-Tag: 2.4.0~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e7e7bbe714c36eb81acf03762757904cbf38f79;p=thirdparty%2Fdovecot%2Fcore.git

lib-ldap: ldap_client_settings - Rename debug into debug_level
---

diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c
index 0f578de074..b76757eb30 100644
--- a/src/lib-dict-backend/dict-ldap.c
+++ b/src/lib-dict-backend/dict-ldap.c
@@ -128,7 +128,7 @@ int dict_ldap_connect(struct ldap_dict *dict, const char **error_r)
 	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;
+	set.debug_level = dict->set->debug;
 	set.require_ssl = dict->set->require_ssl;
 	set.starttls = dict->set->start_tls;
 	set.event_parent = dict->event;
diff --git a/src/lib-ldap/ldap-client.h b/src/lib-ldap/ldap-client.h
index 9f689d4d05..3f9208d0a5 100644
--- a/src/lib-ldap/ldap-client.h
+++ b/src/lib-ldap/ldap-client.h
@@ -30,7 +30,7 @@ struct ldap_client_settings {
 
 	unsigned int timeout_secs;
 	unsigned int max_idle_time_secs;
-	unsigned int debug;
+	unsigned int debug_level;
 	bool require_ssl;
 	bool starttls;
 };
diff --git a/src/lib-ldap/ldap-connection.c b/src/lib-ldap/ldap-connection.c
index 88d6f4b22a..3c557899d8 100644
--- a/src/lib-ldap/ldap-connection.c
+++ b/src/lib-ldap/ldap-connection.c
@@ -98,7 +98,7 @@ int ldap_connection_setup(struct ldap_connection *conn, const char **error_r)
 	if (conn->ssl_set.curve_list != NULL)
 		ldap_set_option(conn->conn, LDAP_OPT_X_TLS_ECNAME, conn->ssl_set.curve_list);
 
-	opt = conn->set.debug;
+	opt = conn->set.debug_level;
 	ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &opt);
 
 	opt = LDAP_VERSION3;
@@ -127,7 +127,7 @@ bool ldap_connection_have_settings(struct ldap_connection *conn,
 		return FALSE;
 	if (conn_set->timeout_secs != set->timeout_secs ||
 	    conn_set->max_idle_time_secs != set->max_idle_time_secs ||
-	    conn_set->debug != set->debug ||
+	    conn_set->debug_level != set->debug_level ||
 	    conn_set->require_ssl != set->require_ssl ||
 	    conn_set->starttls != set->starttls)
 		return FALSE;
@@ -403,7 +403,7 @@ ldap_connection_connect_parse(struct ldap_connection *conn,
 					return LDAP_UNAVAILABLE;
 				}
 			} else {
-				if (conn->set.debug > 0)
+				if (conn->set.debug_level > 0)
 					e_debug(conn->event,
 						"Using TLS connection to remote LDAP server");
 			}