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

lib-ldap: ldap_client_settings - Rename start_tls into starttls
---

diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c
index c051ec138e..234ead8602 100644
--- a/src/lib-dict-backend/dict-ldap.c
+++ b/src/lib-dict-backend/dict-ldap.c
@@ -130,7 +130,7 @@ int dict_ldap_connect(struct ldap_dict *dict, const char **error_r)
 	set.max_idle_time_secs = dict->set->max_idle_time;
 	set.debug = dict->set->debug;
 	set.require_ssl = dict->set->require_ssl;
-	set.start_tls = dict->set->start_tls;
+	set.starttls = dict->set->start_tls;
 	set.event_parent = dict->event;
 	return ldap_client_init(&set, &dict->client, error_r);
 }
diff --git a/src/lib-ldap/ldap-client.h b/src/lib-ldap/ldap-client.h
index 91ed0af2aa..aa998dba19 100644
--- a/src/lib-ldap/ldap-client.h
+++ b/src/lib-ldap/ldap-client.h
@@ -32,7 +32,7 @@ struct ldap_client_settings {
 	unsigned int max_idle_time_secs;
 	unsigned int debug;
 	bool require_ssl;
-	bool start_tls;
+	bool starttls;
 };
 
 struct ldap_search_input {
diff --git a/src/lib-ldap/ldap-connection.c b/src/lib-ldap/ldap-connection.c
index bdc8d1600b..d12b7d3d4e 100644
--- a/src/lib-ldap/ldap-connection.c
+++ b/src/lib-ldap/ldap-connection.c
@@ -129,10 +129,10 @@ bool ldap_connection_have_settings(struct ldap_connection *conn,
 	    conn_set->max_idle_time_secs != set->max_idle_time_secs ||
 	    conn_set->debug != set->debug ||
 	    conn_set->require_ssl != set->require_ssl ||
-	    conn_set->start_tls != set->start_tls)
+	    conn_set->starttls != set->starttls)
 		return FALSE;
 
-	if (set->ssl_set == NULL || !set->start_tls)
+	if (set->ssl_set == NULL || !set->starttls)
 		return TRUE;
 
 	/* check SSL settings */
@@ -160,7 +160,7 @@ int ldap_connection_init(struct ldap_client *client,
 	i_assert(set->uri != NULL);
 
 	if (set->require_ssl &&
-	    !set->start_tls &&
+	    !set->starttls &&
 	    strncmp("ldaps://",set->uri,8) != 0) {
 		*error_r = t_strdup_printf("ldap_connection_init(uri=%s) failed: %s", set->uri,
 			"uri does not start with ldaps and ssl required without start TLS");
@@ -504,7 +504,7 @@ ldap_connect_next_message(struct ldap_connection *conn,
 	switch(conn->state) {
 	case LDAP_STATE_DISCONNECT:
 		/* if we should not disable SSL, and the URI is not ldaps:// */
-		if (!conn->set.start_tls || strstr(conn->set.uri, "ldaps://") == NULL) {
+		if (!conn->set.starttls || strstr(conn->set.uri, "ldaps://") == NULL) {
 			ret = ldap_start_tls(conn->conn, NULL, NULL, &req->msgid);
 			if (ret != LDAP_SUCCESS) {
 				ldap_connection_result_failure(conn, req, ret, t_strdup_printf(