From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Fri, 20 Sep 2024 16:21:09 +0000 (+0000)
Subject: lib-ldap: ldap_client_settings - Rename ssl_set into ssl_ioset
X-Git-Tag: 2.4.0~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46fc8ed2a6b6bddb56532d41bcc503322fcd97aa;p=thirdparty%2Fdovecot%2Fcore.git

lib-ldap: ldap_client_settings - Rename ssl_set into ssl_ioset
---

diff --git a/src/lib-ldap/ldap-client.h b/src/lib-ldap/ldap-client.h
index 3f9208d0a5..ce10332f78 100644
--- a/src/lib-ldap/ldap-client.h
+++ b/src/lib-ldap/ldap-client.h
@@ -26,7 +26,7 @@ struct ldap_client_settings {
 	const char *auth_dn_password;
 
 	struct event *event_parent;
-	const struct ssl_iostream_settings *ssl_set;
+	const struct ssl_iostream_settings *ssl_ioset;
 
 	unsigned int timeout_secs;
 	unsigned int max_idle_time_secs;
diff --git a/src/lib-ldap/ldap-connection.c b/src/lib-ldap/ldap-connection.c
index 3c557899d8..a6c8b984cb 100644
--- a/src/lib-ldap/ldap-connection.c
+++ b/src/lib-ldap/ldap-connection.c
@@ -132,23 +132,23 @@ bool ldap_connection_have_settings(struct ldap_connection *conn,
 	    conn_set->starttls != set->starttls)
 		return FALSE;
 
-	if (set->ssl_set == NULL || !set->starttls)
+	if (set->ssl_ioset == NULL || !set->starttls)
 		return TRUE;
 
 	/* check SSL settings */
-	if (null_strcmp(conn->ssl_set.min_protocol, set->ssl_set->min_protocol) != 0)
+	if (null_strcmp(conn->ssl_set.min_protocol, set->ssl_ioset->min_protocol) != 0)
 		return FALSE;
-	if (null_strcmp(conn->ssl_set.cipher_list, set->ssl_set->cipher_list) != 0)
+	if (null_strcmp(conn->ssl_set.cipher_list, set->ssl_ioset->cipher_list) != 0)
 		return FALSE;
-	if (null_strcmp(conn->ssl_set.curve_list, set->ssl_set->curve_list) != 0)
+	if (null_strcmp(conn->ssl_set.curve_list, set->ssl_ioset->curve_list) != 0)
 		return FALSE;
-	if (null_strcmp(conn->ssl_set.ca.path, set->ssl_set->ca.path) != 0)
+	if (null_strcmp(conn->ssl_set.ca.path, set->ssl_ioset->ca.path) != 0)
 		return FALSE;
 	if (null_strcmp(conn->ssl_set.cert.cert.content,
-			set->ssl_set->cert.cert.content) != 0)
+			set->ssl_ioset->cert.cert.content) != 0)
 		return FALSE;
 	if (null_strcmp(conn->ssl_set.cert.key.content,
-			set->ssl_set->cert.key.content) != 0)
+			set->ssl_ioset->cert.key.content) != 0)
 		return FALSE;
 	return TRUE;
 }
@@ -187,22 +187,22 @@ int ldap_connection_init(struct ldap_client *client,
 	conn->ssl_set.cert_username_field = NULL;
 	conn->ssl_set.crypto_device = NULL;
 
-	if (set->ssl_set != NULL) {
+	if (set->ssl_ioset != NULL) {
 		/* keep in sync with ldap_connection_have_settings() */
-		conn->set.ssl_set = &conn->ssl_set;
-		conn->ssl_set.min_protocol = p_strdup(pool, set->ssl_set->min_protocol);
-		conn->ssl_set.cipher_list = p_strdup(pool, set->ssl_set->cipher_list);
-		conn->ssl_set.ca.path = p_strdup(pool, set->ssl_set->ca.path);
+		conn->set.ssl_ioset = &conn->ssl_set;
+		conn->ssl_set.min_protocol = p_strdup(pool, set->ssl_ioset->min_protocol);
+		conn->ssl_set.cipher_list = p_strdup(pool, set->ssl_ioset->cipher_list);
+		conn->ssl_set.ca.path = p_strdup(pool, set->ssl_ioset->ca.path);
 		conn->ssl_set.ca.content =
-			p_strdup(pool, set->ssl_set->ca.content);
+			p_strdup(pool, set->ssl_ioset->ca.content);
 		conn->ssl_set.cert.cert.path =
-			p_strdup(pool, set->ssl_set->cert.cert.path);
+			p_strdup(pool, set->ssl_ioset->cert.cert.path);
 		conn->ssl_set.cert.cert.content =
-			p_strdup(pool, set->ssl_set->cert.cert.content);
+			p_strdup(pool, set->ssl_ioset->cert.cert.content);
 		conn->ssl_set.cert.key.path =
-			p_strdup(pool, set->ssl_set->cert.key.path);
+			p_strdup(pool, set->ssl_ioset->cert.key.path);
 		conn->ssl_set.cert.key.content =
-			p_strdup(pool, set->ssl_set->cert.key.content);
+			p_strdup(pool, set->ssl_ioset->cert.key.content);
 	}
 	i_assert(ldap_connection_have_settings(conn, set));