lib-storage: Added mail_user_init_ssl_client_settings().

dovecot · Feb 17, 2017 · 77643f9 · 77643f9
1 parent 0167220
commit 77643f9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
@@ -576,13 +576,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;
@@ -591,8 +598,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
@@ -180,6 +180,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,