Mercurial > dovecot > core-2.2

changeset 21502:0b4290b4a080

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: Added mail_user_init_ssl_client_settings().
author Stephan Bosch <stephan.bosch@dovecot.fi>
date Sun, 22 Jan 2017 13:40:00 +0100
parents 87637564667f
children 8aa60021b469
files src/lib-storage/mail-user.c src/lib-storage/mail-user.h
diffstat 2 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/mail-user.c	Wed Dec 28 12:02:14 2016 -0600
+++ b/src/lib-storage/mail-user.c	Sun Jan 22 13:40:00 2017 +0100
@@ -576,13 +576,20 @@
 	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;
@@ -591,8 +598,7 @@
 	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)
--- a/src/lib-storage/mail-user.h	Wed Dec 28 12:02:14 2016 -0600
+++ b/src/lib-storage/mail-user.h	Sun Jan 22 13:40:00 2017 +0100
@@ -180,6 +180,10 @@
 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,