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 c35cde4566cfd6f8926a456a9cd104b26e0aadf7..cc15d572dfbb86a03454a08d60b6f70c32a47dec 100644 (file)
--- 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 2c3f8dafbd59aadeb065f8286928ba3e8070c65a..aeead03675e03f1ee084c3df03da35e46b799a1f 100644 (file)
--- 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;