lib-storage: imapc - Use mail_user_ssl_settings

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index a39bf62f5e3628debe65165a919b97042d6247f9..d90ea66b3387d699b9ac0bfe9a7399847873fd62 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -339,16 +339,16 @@ int imapc_storage_client_create(struct mail_namespace *ns,
        mail_user_set_get_temp_prefix(str, ns->user->set);
        set.temp_path_prefix = str_c(str);
 
-       set.ssl_ca_dir = mail_set->ssl_client_ca_dir;
-       set.ssl_ca_file = mail_set->ssl_client_ca_file;
-       set.ssl_verify = imapc_set->imapc_ssl_verify;
+       mail_user_init_ssl_client_settings(ns->user, &set.ssl_set);
+       if (!imapc_set->imapc_ssl_verify)
+               set.ssl_set.allow_invalid_cert = TRUE;
+
        if (strcmp(imapc_set->imapc_ssl, "imaps") == 0)
                set.ssl_mode = IMAPC_CLIENT_SSL_MODE_IMMEDIATE;
        else if (strcmp(imapc_set->imapc_ssl, "starttls") == 0)
                set.ssl_mode = IMAPC_CLIENT_SSL_MODE_STARTTLS;
        else
                set.ssl_mode = IMAPC_CLIENT_SSL_MODE_NONE;
-       set.ssl_crypto_device = mail_set->ssl_crypto_device;
 
        set.throttle_set.init_msecs = imapc_set->throttle_init_msecs;
        set.throttle_set.max_msecs = imapc_set->throttle_max_msecs;