From: Timo Sirainen Date: Sat, 26 Feb 2022 22:19:38 +0000 (+0100) Subject: lib-master, global: Replace master_service_ssl_settings_get() with master_service_set... X-Git-Tag: 2.4.0~3357 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=446eb876ac16f5cd45186a744f683472f98a5521;p=thirdparty%2Fdovecot%2Fcore.git lib-master, global: Replace master_service_ssl_settings_get() with master_service_settings_get_root_set() --- diff --git a/src/auth/auth-policy.c b/src/auth/auth-policy.c index ace932a560..31145f2ddc 100644 --- a/src/auth/auth-policy.c +++ b/src/auth/auth-policy.c @@ -13,6 +13,7 @@ #include "http-client.h" #include "json-parser.h" #include "master-service.h" +#include "master-service-settings.h" #include "master-service-ssl-settings.h" #include "auth-request.h" #include "auth-penalty.h" @@ -163,7 +164,8 @@ void auth_policy_open_and_close_to_key(const char *fromkey, const char *tokey, s void auth_policy_init(void) { const struct master_service_ssl_settings *master_ssl_set = - master_service_ssl_settings_get(master_service); + master_service_settings_get_root_set(master_service, + &master_service_ssl_setting_parser_info); struct ssl_iostream_settings ssl_set; i_zero(&ssl_set); diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c index 8ef83d758f..c1cafea5f0 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c @@ -273,9 +273,10 @@ void doveadm_read_settings(void) set = sets[1]; doveadm_settings = settings_dup(&doveadm_setting_parser_info, set, doveadm_settings_pool); + doveadm_ssl_set = master_service_settings_get_root_set(master_service, + &master_service_ssl_setting_parser_info); doveadm_ssl_set = settings_dup(&master_service_ssl_setting_parser_info, - master_service_ssl_settings_get(master_service), - doveadm_settings_pool); + doveadm_ssl_set, doveadm_settings_pool); doveadm_settings_expand(doveadm_settings, doveadm_settings_pool); doveadm_settings->parsed_features = set->parsed_features; /* copy this value by hand */ diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c index 634a96d564..c66847e490 100644 --- a/src/lib-master/master-service-ssl-settings.c +++ b/src/lib-master/master-service-ssl-settings.c @@ -163,13 +163,6 @@ master_service_ssl_settings_check(void *_set, pool_t pool ATTR_UNUSED, } /* */ -const struct master_service_ssl_settings * -master_service_ssl_settings_get(struct master_service *service) -{ - return settings_parser_get_root_set(service->set_parser, - &master_service_ssl_setting_parser_info); -} - const struct master_service_ssl_server_settings * master_service_ssl_server_settings_get(struct master_service *service) { diff --git a/src/lib-master/master-service-ssl-settings.h b/src/lib-master/master-service-ssl-settings.h index 788571f6ad..bd1fd82b10 100644 --- 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_settings * -master_service_ssl_settings_get(struct master_service *service); - const struct master_service_ssl_server_settings * master_service_ssl_server_settings_get(struct master_service *service); diff --git a/src/lib-master/master-service-ssl.c b/src/lib-master/master-service-ssl.c index e3b9fc5fec..2d931f631d 100644 --- a/src/lib-master/master-service-ssl.c +++ b/src/lib-master/master-service-ssl.c @@ -21,7 +21,8 @@ int master_service_ssl_init(struct master_service *service, i_assert(service->ssl_ctx_initialized); - set = master_service_ssl_settings_get(service); + set = master_service_settings_get_root_set(service, + &master_service_ssl_setting_parser_info); if (service->ssl_ctx == NULL) { if (strcmp(set->ssl, "no") == 0) *error_r = "SSL is disabled (ssl=no)"; @@ -57,7 +58,8 @@ void master_service_ssl_ctx_init(struct master_service *service) initialization fails we can close the SSL listeners */ i_assert(service->listeners != NULL || service->socket_count == 0); - set = master_service_ssl_settings_get(service); + set = master_service_settings_get_root_set(service, + &master_service_ssl_setting_parser_info); server_set = master_service_ssl_server_settings_get(service); if (strcmp(set->ssl, "no") == 0) { /* SSL disabled, don't use it */ diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c index 76276848dd..ef61d9f0fb 100644 --- a/src/lmtp/lmtp-proxy.c +++ b/src/lmtp/lmtp-proxy.c @@ -18,6 +18,7 @@ #include "smtp-dovecot.h" #include "auth-proxy.h" #include "auth-master.h" +#include "master-service-settings.h" #include "master-service-ssl-settings.h" #include "mail-storage-service.h" #include "lda-settings.h" @@ -206,7 +207,8 @@ lmtp_proxy_connection_init_ssl(struct lmtp_proxy_connection *conn, return; } - master_ssl_set = master_service_ssl_settings_get(master_service); + master_ssl_set = master_service_settings_get_root_set(master_service, + &master_service_ssl_setting_parser_info); master_service_ssl_client_settings_to_iostream_set( master_ssl_set, pool_datastack_create(), ssl_set_r); if ((conn->set.set.ssl_flags & AUTH_PROXY_SSL_FLAG_ANY_CERT) != 0) diff --git a/src/stats/event-exporter-transport-http-post.c b/src/stats/event-exporter-transport-http-post.c index 6d328cdfb6..cd8a941469 100644 --- a/src/stats/event-exporter-transport-http-post.c +++ b/src/stats/event-exporter-transport-http-post.c @@ -7,6 +7,7 @@ #include "http-client.h" #include "iostream-ssl.h" #include "master-service.h" +#include "master-service-settings.h" #include "master-service-ssl-settings.h" /* the http client used to export all events with exporter=http-post */ @@ -50,7 +51,8 @@ void event_export_transport_http_post(const struct exporter *exporter, if (exporter_http_client == NULL) { const struct master_service_ssl_settings *master_ssl_set = - master_service_ssl_settings_get(master_service); + master_service_settings_get_root_set(master_service, + &master_service_ssl_setting_parser_info); struct ssl_iostream_settings ssl_set; struct http_client_settings set = {