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 c8c147e40fd9b45f2ae35c361234d13e318ec230..26f378ed990aa6c373c009866847ba6746400dd3 100644 (file)
--- 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 44e63d438ebcde3b8e56ccef544a2e4cc381242d..babd67980f2aa5fb401d531f8e8b562bfc9ef740 100644 (file)
--- 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 2500ba0a04aef8e555b8aef6f70ada08efbd952f..bf7d468525aabf9cb0b24a36c8b3fe0697bcf969 100644 (file)
--- 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 c5438f0598ea9d50dfe8b9e58d4a844560011a8a..0b5d9da6d23bd7820365a19fe0f15d56aba319a3 100644 (file)
--- 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,