From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 15 Nov 2018 12:42:28 +0000 (+0200)
Subject: lib-storage: mail-user - Use mail_storage_settings_init_ssl_client_settings
X-Git-Tag: 2.3.9~886
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4d9f28cb6a15e126f8fc0b9d8f9c408bcc2dfeb;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mail-user - Use mail_storage_settings_init_ssl_client_settings
---

diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index 9a564b972c..fadc221211 100644
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -694,19 +694,7 @@ void mail_user_init_ssl_client_settings(struct mail_user *user,
 	const struct mail_storage_settings *mail_set =
 		mail_user_set_get_storage_set(user);
 
-	ssl_set->ca_dir = mail_set->ssl_client_ca_dir;
-	ssl_set->ca_file = mail_set->ssl_client_ca_file;
-	if (*mail_set->ssl_client_cert != '\0')
-		ssl_set->cert.cert = mail_set->ssl_client_cert;
-	if (*mail_set->ssl_client_key != '\0')
-		ssl_set->cert.key = mail_set->ssl_client_key;
-	ssl_set->cipher_list = mail_set->ssl_cipher_list;
-	ssl_set->curve_list = mail_set->ssl_curve_list;
-	ssl_set->min_protocol = mail_set->ssl_min_protocol;
-	ssl_set->crypto_device = mail_set->ssl_crypto_device;
-	ssl_set->verify_remote_cert = mail_set->ssl_client_require_valid_cert;
-	ssl_set->allow_invalid_cert = !ssl_set->verify_remote_cert;
-	ssl_set->verbose = mail_set->verbose_ssl;
+	mail_storage_settings_init_ssl_client_settings(mail_set, ssl_set);
 }
 
 void mail_user_init_fs_settings(struct mail_user *user,