From 26bdbffc35ee46779f15a537a757ed937a4d1c91 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Sun, 22 Jan 2017 13:40:00 +0100 Subject: [PATCH] lib-storage: Added mail_user_init_ssl_client_settings(). --- src/lib-storage/mail-user.c | 14 ++++++++++---- src/lib-storage/mail-user.h | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c index 4a02930346..507b49a850 100644 --- a/src/lib-storage/mail-user.c +++ b/src/lib-storage/mail-user.c @@ -617,13 +617,20 @@ struct mail_user *mail_user_dup(struct mail_user *user) return user2; } -void mail_user_init_fs_settings(struct mail_user *user, - struct fs_settings *fs_set, +void mail_user_init_ssl_client_settings(struct mail_user *user, struct ssl_iostream_settings *ssl_set) { 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; +} + +void mail_user_init_fs_settings(struct mail_user *user, + struct fs_settings *fs_set, + struct ssl_iostream_settings *ssl_set) +{ fs_set->username = user->username; fs_set->session_id = user->session_id; fs_set->base_dir = user->set->base_dir; @@ -632,8 +639,7 @@ void mail_user_init_fs_settings(struct mail_user *user, fs_set->enable_timing = user->stats_enabled; fs_set->ssl_client_set = ssl_set; - ssl_set->ca_dir = mail_set->ssl_client_ca_dir; - ssl_set->ca_file = mail_set->ssl_client_ca_file; + mail_user_init_ssl_client_settings(user, ssl_set); } void mail_user_stats_fill(struct mail_user *user, struct stats *stats) diff --git a/src/lib-storage/mail-user.h b/src/lib-storage/mail-user.h index 7b0bd45598..40731f772e 100644 --- a/src/lib-storage/mail-user.h +++ b/src/lib-storage/mail-user.h @@ -183,6 +183,10 @@ const char *mail_user_get_anvil_userip_ident(struct mail_user *user); struct mail_storage * mail_user_get_storage_class(struct mail_user *user, const char *name); +/* Initialize SSL client settings from mail_user settings. */ +void mail_user_init_ssl_client_settings(struct mail_user *user, + struct ssl_iostream_settings *ssl_set); + /* Initialize fs_settings from mail_user settings. */ void mail_user_init_fs_settings(struct mail_user *user, struct fs_settings *fs_set, -- 2.47.3