lib-master: Replace master_service_ssl_server_settings_get() with master_service_sett...

diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c
index c66847e490cb741706d89221593d96a26e6d86d1..fcc06169e81d07da36743513c48e7ab268ff63d0 100644 (file)
--- a/src/lib-master/master-service-ssl-settings.c
+++ b/src/lib-master/master-service-ssl-settings.c
@@ -163,16 +163,6 @@ master_service_ssl_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 }
 /* </settings checks> */
 
-const struct master_service_ssl_server_settings *
-master_service_ssl_server_settings_get(struct master_service *service)
-{
-       void **sets;
-
-       i_assert(service->want_ssl_server);
-       sets = settings_parser_get_list(service->set_parser);
-       return sets[2];
-}
-
 static void master_service_ssl_common_settings_to_iostream_set(
        const struct master_service_ssl_settings *ssl_set, pool_t pool,
        struct ssl_iostream_settings *set_r)

diff --git a/src/lib-master/master-service-ssl-settings.h b/src/lib-master/master-service-ssl-settings.h
index bd1fd82b10301763f976b172fc055ff998ec38f3..a1347df6ffe2418d16c5089c2a344cda52cf9b8d 100644 (file)
--- a/src/lib-master/master-service-ssl-settings.h
+++ b/src/lib-master/master-service-ssl-settings.h
@@ -45,9 +45,6 @@ struct master_service_ssl_server_settings {
 extern const struct setting_parser_info master_service_ssl_setting_parser_info;
 extern const struct setting_parser_info master_service_ssl_server_setting_parser_info;
 
-const struct master_service_ssl_server_settings *
-master_service_ssl_server_settings_get(struct master_service *service);
-
 /* Provides master service ssl settings to iostream settings */
 void master_service_ssl_client_settings_to_iostream_set(
        const struct master_service_ssl_settings *ssl_set, pool_t pool,

diff --git a/src/lib-master/master-service-ssl.c b/src/lib-master/master-service-ssl.c
index 2d931f631da7e3def1a9c1df08cb68df06198fb2..8e9c90bf538f9ad98d8307a286e14c433a64e5fb 100644 (file)
--- a/src/lib-master/master-service-ssl.c
+++ b/src/lib-master/master-service-ssl.c
@@ -60,7 +60,8 @@ void master_service_ssl_ctx_init(struct master_service *service)
 
        set = master_service_settings_get_root_set(service,
                        &master_service_ssl_setting_parser_info);
-       server_set = master_service_ssl_server_settings_get(service);
+       server_set = master_service_settings_get_root_set(service,
+                       &master_service_ssl_server_setting_parser_info);
        if (strcmp(set->ssl, "no") == 0) {
                /* SSL disabled, don't use it */
                return;