From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Mon, 25 Mar 2024 14:00:53 +0000 (+0100)
Subject: lib-imap-client, lib-storage: Remove imapc_ssl_verify setting
X-Git-Tag: 2.4.0~541
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37a4285e3d699917575182703aae5ad3ac7fe93d;p=thirdparty%2Fdovecot%2Fcore.git

lib-imap-client, lib-storage: Remove imapc_ssl_verify setting

In its place `ssl_client_require_valid_cert` must be used.
---

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index c8c147e40f..26f378ed99 100644
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -1687,8 +1687,6 @@ static int imapc_connection_ssl_init(struct imapc_connection *conn)
 
 	io_remove(&conn->io);
 	enum ssl_iostream_flags ssl_flags = 0;
-	if (!conn->client->set->imapc_ssl_verify)
-		ssl_flags |= SSL_IOSTREAM_FLAG_ALLOW_INVALID_CERT;
 	if (io_stream_autocreate_ssl_client(conn->event,
 					    conn->client->set->imapc_host,
 					    ssl_flags,
diff --git a/src/lib-imap-client/imapc-settings.c b/src/lib-imap-client/imapc-settings.c
index 44e63d438e..babd67980f 100644
--- a/src/lib-imap-client/imapc-settings.c
+++ b/src/lib-imap-client/imapc-settings.c
@@ -22,7 +22,6 @@ static const struct setting_define imapc_setting_defines[] = {
 	DEF(BOOLLIST, imapc_sasl_mechanisms),
 
 	DEF(ENUM, imapc_ssl),
-	DEF(BOOL, imapc_ssl_verify),
 
 	DEF(BOOLLIST, imapc_features),
 	DEF(STR, imapc_rawlog_dir),
@@ -51,7 +50,6 @@ static const struct imapc_settings imapc_default_settings = {
 	.imapc_sasl_mechanisms = ARRAY_INIT,
 
 	.imapc_ssl = "no:imaps:starttls",
-	.imapc_ssl_verify = TRUE,
 
 	.imapc_features = ARRAY_INIT,
 	.imapc_rawlog_dir = "",
diff --git a/src/lib-imap-client/imapc-settings.h b/src/lib-imap-client/imapc-settings.h
index 2500ba0a04..bf7d468525 100644
--- a/src/lib-imap-client/imapc-settings.h
+++ b/src/lib-imap-client/imapc-settings.h
@@ -45,7 +45,6 @@ struct imapc_settings {
 	ARRAY_TYPE(const_string) imapc_sasl_mechanisms;
 
 	const char *imapc_ssl;
-	bool imapc_ssl_verify;
 
 	ARRAY_TYPE(const_string) imapc_features;
 	const char *imapc_rawlog_dir;
diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index c5438f0598..0b5d9da6d2 100644
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -412,11 +412,10 @@ imapc_storage_create(struct mail_storage *_storage,
 
 	/* serialize all the settings */
 	_storage->unique_root_dir = p_strdup_printf(_storage->pool,
-						    "%s%s://(%s|%s):%s@%s:%u/%s mechs:%s features:%s "
+						    "%s://(%s|%s):%s@%s:%u/%s mechs:%s features:%s "
 						    "rawlog:%s cmd_timeout:%u maxidle:%u maxline:%zuu "
 						    "pop3delflg:%s root_dir:%s",
 						    storage->set->imapc_ssl,
-						    storage->set->imapc_ssl_verify ? "(verify)" : "",
 						    storage->set->imapc_user,
 						    storage->set->imapc_master_user,
 						    storage->set->imapc_password,