From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 31 Oct 2017 22:26:02 +0000 (+0200)
Subject: lib-master: Add ssl_client_ca_file & _dir to master_service_ssl_settings
X-Git-Tag: 2.3.0.rc1~533
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d4fb028a24e03b52152f3cfb309596a27aae91e;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Add ssl_client_ca_file & _dir to master_service_ssl_settings
---

diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c
index c35cde4566..cc15d572df 100644
--- a/src/lib-master/master-service-ssl-settings.c
+++ b/src/lib-master/master-service-ssl-settings.c
@@ -23,6 +23,8 @@ static const struct setting_define master_service_ssl_setting_defines[] = {
 	DEF(SET_STR, ssl_alt_cert),
 	DEF(SET_STR, ssl_alt_key),
 	DEF(SET_STR, ssl_key_password),
+	DEF(SET_STR, ssl_client_ca_file),
+	DEF(SET_STR, ssl_client_ca_dir),
 	DEF(SET_STR, ssl_dh),
 	DEF(SET_STR, ssl_cipher_list),
 	DEF(SET_STR, ssl_curve_list),
@@ -50,6 +52,8 @@ static const struct master_service_ssl_settings master_service_ssl_default_setti
 	.ssl_alt_cert = "",
 	.ssl_alt_key = "",
 	.ssl_key_password = "",
+	.ssl_client_ca_file = "",
+	.ssl_client_ca_dir = "",
 	.ssl_dh = "",
 	.ssl_cipher_list = "ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH",
 	.ssl_curve_list = "",
diff --git a/src/lib-master/master-service-ssl-settings.h b/src/lib-master/master-service-ssl-settings.h
index 2c3f8dafbd..aeead03675 100644
--- a/src/lib-master/master-service-ssl-settings.h
+++ b/src/lib-master/master-service-ssl-settings.h
@@ -12,6 +12,8 @@ struct master_service_ssl_settings {
 	const char *ssl_key;
 	const char *ssl_alt_key;
 	const char *ssl_key_password;
+	const char *ssl_client_ca_file;
+	const char *ssl_client_ca_dir;
 	const char *ssl_dh;
 	const char *ssl_cipher_list;
 	const char *ssl_curve_list;