From: Timo Sirainen Date: Fri, 16 Jun 2023 12:57:39 +0000 (+0300) Subject: lib-master, global: Rename master_service_ssl_*settings to just ssl_*settings X-Git-Tag: 2.4.1~1495 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4154bedc4ced9d5f5166227ca6ea5d9732cd88f5;p=thirdparty%2Fdovecot%2Fcore.git lib-master, global: Rename master_service_ssl_*settings to just ssl_*settings --- diff --git a/src/auth/auth-policy.c b/src/auth/auth-policy.c index fe0fe9e38f..3552e4cf64 100644 --- a/src/auth/auth-policy.c +++ b/src/auth/auth-policy.c @@ -155,22 +155,20 @@ auth_policy_open_and_close_to_key(struct json_ostream *json_output, void auth_policy_init(void) { - const struct master_service_ssl_settings *master_ssl_set = + const struct ssl_settings *ssl_set = settings_get_or_fatal(master_service_get_event(master_service), - &master_service_ssl_setting_parser_info); - const struct ssl_iostream_settings *ssl_set; + &ssl_setting_parser_info); http_client_set.request_absolute_timeout_msecs = global_auth_settings->policy_server_timeout_msecs; if (global_auth_settings->debug) http_client_set.debug = 1; - master_service_ssl_client_settings_to_iostream_set(master_ssl_set, &ssl_set); - http_client_set.ssl = ssl_set; + ssl_client_settings_to_iostream_set(ssl_set, &http_client_set.ssl); http_client_set.event_parent = auth_event; http_client = http_client_init(&http_client_set); - settings_free(master_ssl_set); settings_free(ssl_set); + settings_free(http_client_set.ssl); /* prepare template */ diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c index b09f42b25a..1f3320c36a 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c @@ -192,11 +192,11 @@ static bool doveadm_settings_check(void *_set, pool_t pool ATTR_UNUSED, } /* */ -const struct master_service_ssl_settings *doveadm_ssl_set = NULL; +const struct ssl_settings *doveadm_ssl_set = NULL; void doveadm_get_ssl_settings(const struct ssl_iostream_settings **set_r) { - master_service_ssl_client_settings_to_iostream_set(doveadm_ssl_set, set_r); + ssl_client_settings_to_iostream_set(doveadm_ssl_set, set_r); } void doveadm_read_settings(void) @@ -224,7 +224,7 @@ void doveadm_read_settings(void) &doveadm_setting_parser_info); doveadm_ssl_set = settings_get_or_fatal(master_service_get_event(master_service), - &master_service_ssl_setting_parser_info); + &ssl_setting_parser_info); } int doveadm_settings_get_config_fd(void) diff --git a/src/doveadm/doveadm-settings.h b/src/doveadm/doveadm-settings.h index 6990354225..5ceabf8a92 100644 --- a/src/doveadm/doveadm-settings.h +++ b/src/doveadm/doveadm-settings.h @@ -42,7 +42,7 @@ struct doveadm_settings { extern const struct setting_parser_info doveadm_setting_parser_info; extern const struct doveadm_settings *doveadm_settings; -extern const struct master_service_ssl_settings *doveadm_ssl_set; +extern const struct ssl_settings *doveadm_ssl_set; extern bool doveadm_verbose_proctitle; void doveadm_get_ssl_settings(const struct ssl_iostream_settings **set_r); diff --git a/src/lib-lua/dlua-dovecot-http.c b/src/lib-lua/dlua-dovecot-http.c index 70a3d39dbd..050a4abf49 100644 --- a/src/lib-lua/dlua-dovecot-http.c +++ b/src/lib-lua/dlua-dovecot-http.c @@ -527,7 +527,6 @@ static int dlua_http_client_new(lua_State *L) struct http_client *client; struct http_client_settings http_set; - const struct ssl_iostream_settings *ssl_set; const char *error; i_zero(&http_set); @@ -536,17 +535,15 @@ static int dlua_http_client_new(lua_State *L) if (parse_client_settings(L, &http_set, &error) < 0) luaL_error(L, "Invalid HTTP client setting: %s", error); - const struct master_service_ssl_settings *master_ssl_set; - if (settings_get(script->event, - &master_service_ssl_setting_parser_info, - 0, &master_ssl_set, &error) < 0) + const struct ssl_settings *ssl_set; + if (settings_get(script->event, &ssl_setting_parser_info, + 0, &ssl_set, &error) < 0) luaL_error(L, "%s", error); - master_service_ssl_client_settings_to_iostream_set(master_ssl_set, &ssl_set); - http_set.ssl = ssl_set; - settings_free(master_ssl_set); + ssl_client_settings_to_iostream_set(ssl_set, &http_set.ssl); + settings_free(ssl_set); client = http_client_init(&http_set); - settings_free(ssl_set); + settings_free(http_set.ssl); dlua_push_http_client(L, client); return 1; } diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c index 6e83838702..af8b8eaf38 100644 --- a/src/lib-master/master-service-ssl-settings.c +++ b/src/lib-master/master-service-ssl-settings.c @@ -8,14 +8,14 @@ #undef DEF #define DEF(type, name) \ - SETTING_DEFINE_STRUCT_##type(#name, name, struct master_service_ssl_settings) + SETTING_DEFINE_STRUCT_##type(#name, name, struct ssl_settings) static bool -master_service_ssl_settings_check(void *_set, pool_t pool, const char **error_r); +ssl_settings_check(void *_set, pool_t pool, const char **error_r); static bool -master_service_ssl_server_settings_check(void *_set, pool_t pool, const char **error_r); +ssl_server_settings_check(void *_set, pool_t pool, const char **error_r); -static const struct setting_define master_service_ssl_setting_defines[] = { +static const struct setting_define ssl_setting_defines[] = { DEF(STR, ssl_client_ca), DEF(STR, ssl_client_ca_file), DEF(STR, ssl_client_ca_dir), @@ -34,7 +34,7 @@ static const struct setting_define master_service_ssl_setting_defines[] = { SETTING_DEFINE_LIST_END }; -static const struct master_service_ssl_settings master_service_ssl_default_settings = { +static const struct ssl_settings ssl_default_settings = { .ssl_client_ca = "", .ssl_client_ca_file = "", .ssl_client_ca_dir = "", @@ -51,21 +51,21 @@ static const struct master_service_ssl_settings master_service_ssl_default_setti .ssl_options = "", }; -const struct setting_parser_info master_service_ssl_setting_parser_info = { - .name = "master_service_ssl", - .defines = master_service_ssl_setting_defines, - .defaults = &master_service_ssl_default_settings, +const struct setting_parser_info ssl_setting_parser_info = { + .name = "ssl", + .defines = ssl_setting_defines, + .defaults = &ssl_default_settings, - .pool_offset1 = 1 + offsetof(struct master_service_ssl_settings, pool), - .struct_size = sizeof(struct master_service_ssl_settings), - .check_func = master_service_ssl_settings_check + .pool_offset1 = 1 + offsetof(struct ssl_settings, pool), + .struct_size = sizeof(struct ssl_settings), + .check_func = ssl_settings_check }; #undef DEF #define DEF(type, name) \ - SETTING_DEFINE_STRUCT_##type(#name, name, struct master_service_ssl_server_settings) + SETTING_DEFINE_STRUCT_##type(#name, name, struct ssl_server_settings) -static const struct setting_define master_service_ssl_server_setting_defines[] = { +static const struct setting_define ssl_server_setting_defines[] = { DEF(ENUM, ssl), DEF(STR, ssl_ca), DEF(STR, ssl_cert), @@ -83,7 +83,7 @@ static const struct setting_define master_service_ssl_server_setting_defines[] = SETTING_DEFINE_LIST_END }; -static const struct master_service_ssl_server_settings master_service_ssl_server_default_settings = { +static const struct ssl_server_settings ssl_server_default_settings = { .ssl = "yes:no:required", .ssl_ca = "", .ssl_cert = "", @@ -99,23 +99,23 @@ static const struct master_service_ssl_server_settings master_service_ssl_server .ssl_request_client_cert = FALSE, }; -const struct setting_parser_info master_service_ssl_server_setting_parser_info = { - .name = "master_service_ssl_server", +const struct setting_parser_info ssl_server_setting_parser_info = { + .name = "ssl_server", - .defines = master_service_ssl_server_setting_defines, - .defaults = &master_service_ssl_server_default_settings, + .defines = ssl_server_setting_defines, + .defaults = &ssl_server_default_settings, - .pool_offset1 = 1 + offsetof(struct master_service_ssl_server_settings, pool), - .struct_size = sizeof(struct master_service_ssl_server_settings), - .check_func = master_service_ssl_server_settings_check, + .pool_offset1 = 1 + offsetof(struct ssl_server_settings, pool), + .struct_size = sizeof(struct ssl_server_settings), + .check_func = ssl_server_settings_check, }; /* */ static bool -master_service_ssl_settings_check(void *_set, pool_t pool ATTR_UNUSED, - const char **error_r) +ssl_settings_check(void *_set, pool_t pool ATTR_UNUSED, + const char **error_r) { - struct master_service_ssl_settings *set = _set; + struct ssl_settings *set = _set; if (is_config_binary()) T_BEGIN { const char *proto = t_str_ucase(set->ssl_min_protocol); @@ -148,10 +148,10 @@ master_service_ssl_settings_check(void *_set, pool_t pool ATTR_UNUSED, } static bool -master_service_ssl_server_settings_check(void *_set, pool_t pool ATTR_UNUSED, - const char **error_r) +ssl_server_settings_check(void *_set, pool_t pool ATTR_UNUSED, + const char **error_r) { - struct master_service_ssl_server_settings *set = _set; + struct ssl_server_settings *set = _set; if (strcmp(set->ssl, "no") == 0) { /* disabled */ @@ -167,8 +167,7 @@ master_service_ssl_server_settings_check(void *_set, pool_t pool ATTR_UNUSED, /* */ static struct ssl_iostream_settings * -master_service_ssl_common_settings_to_iostream_set( - const struct master_service_ssl_settings *ssl_set) +ssl_common_settings_to_iostream_set(const struct ssl_settings *ssl_set) { struct ssl_iostream_settings *set; pool_t pool = pool_alloconly_create("ssl iostream settings", 256); @@ -187,12 +186,12 @@ master_service_ssl_common_settings_to_iostream_set( return set; } -void master_service_ssl_client_settings_to_iostream_set( - const struct master_service_ssl_settings *ssl_set, +void ssl_client_settings_to_iostream_set( + const struct ssl_settings *ssl_set, const struct ssl_iostream_settings **set_r) { struct ssl_iostream_settings *set = - master_service_ssl_common_settings_to_iostream_set(ssl_set); + ssl_common_settings_to_iostream_set(ssl_set); pool_t pool = set->pool; set->ca = p_strdup_empty(pool, ssl_set->ssl_client_ca); @@ -207,13 +206,13 @@ void master_service_ssl_client_settings_to_iostream_set( *set_r = set; } -void master_service_ssl_server_settings_to_iostream_set( - const struct master_service_ssl_settings *ssl_set, - const struct master_service_ssl_server_settings *ssl_server_set, +void ssl_server_settings_to_iostream_set( + const struct ssl_settings *ssl_set, + const struct ssl_server_settings *ssl_server_set, const struct ssl_iostream_settings **set_r) { struct ssl_iostream_settings *set = - master_service_ssl_common_settings_to_iostream_set(ssl_set); + ssl_common_settings_to_iostream_set(ssl_set); pool_t pool = set->pool; set->ca = p_strdup_empty(pool, ssl_server_set->ssl_ca); diff --git a/src/lib-master/master-service-ssl-settings.h b/src/lib-master/master-service-ssl-settings.h index 6b2cc490b6..21f2ef9e04 100644 --- a/src/lib-master/master-service-ssl-settings.h +++ b/src/lib-master/master-service-ssl-settings.h @@ -5,7 +5,7 @@ struct master_service; struct setting_parser_context; struct ssl_iostream_settings; -struct master_service_ssl_settings { +struct ssl_settings { pool_t pool; const char *ssl_client_ca; @@ -30,7 +30,7 @@ struct master_service_ssl_settings { } parsed_opts; }; -struct master_service_ssl_server_settings { +struct ssl_server_settings { pool_t pool; const char *ssl; @@ -48,16 +48,16 @@ struct master_service_ssl_server_settings { bool ssl_request_client_cert; }; -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; +extern const struct setting_parser_info ssl_setting_parser_info; +extern const struct setting_parser_info ssl_server_setting_parser_info; /* 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, +void ssl_client_settings_to_iostream_set( + const struct ssl_settings *ssl_set, const struct ssl_iostream_settings **set_r); -void master_service_ssl_server_settings_to_iostream_set( - const struct master_service_ssl_settings *ssl_set, - const struct master_service_ssl_server_settings *ssl_server_set, +void ssl_server_settings_to_iostream_set( + const struct ssl_settings *ssl_set, + const struct ssl_server_settings *ssl_server_set, const struct ssl_iostream_settings **set_r); #endif diff --git a/src/lib-master/master-service-ssl.c b/src/lib-master/master-service-ssl.c index cb8181a327..c72669d99b 100644 --- a/src/lib-master/master-service-ssl.c +++ b/src/lib-master/master-service-ssl.c @@ -16,13 +16,12 @@ int master_service_ssl_init(struct master_service *service, struct ssl_iostream **ssl_iostream_r, const char **error_r) { - const struct master_service_ssl_server_settings *server_set; + const struct ssl_server_settings *server_set; int ret; i_assert(service->ssl_ctx_initialized); - if (settings_get(service->event, - &master_service_ssl_server_setting_parser_info, 0, + if (settings_get(service->event, &ssl_server_setting_parser_info, 0, &server_set, error_r) < 0) return -1; if (service->ssl_ctx == NULL) { @@ -47,8 +46,8 @@ bool master_service_ssl_is_enabled(struct master_service *service) void master_service_ssl_ctx_init(struct master_service *service) { - const struct master_service_ssl_settings *set = NULL; - const struct master_service_ssl_server_settings *server_set; + const struct ssl_settings *set = NULL; + const struct ssl_server_settings *server_set; struct ssl_iostream_settings ssl_set; const char *error; @@ -60,11 +59,9 @@ 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); - if (settings_get(service->event, - &master_service_ssl_setting_parser_info, 0, + if (settings_get(service->event, &ssl_setting_parser_info, 0, &set, &error) < 0 || - settings_get(service->event, - &master_service_ssl_server_setting_parser_info, 0, + settings_get(service->event, &ssl_server_setting_parser_info, 0, &server_set, &error) < 0) { e_error(service->event, "%s - disabling SSL", error); settings_free(set); diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index f91400f72b..0075f1b176 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -1593,12 +1593,12 @@ int mail_storage_service_user_init_ssl_client_settings( struct mail_storage_service_user *user, const struct ssl_iostream_settings **ssl_set_r, const char **error_r) { - const struct master_service_ssl_settings *ssl_set; + const struct ssl_settings *ssl_set; - if (settings_get(user->event, &master_service_ssl_setting_parser_info, + if (settings_get(user->event, &ssl_setting_parser_info, 0, &ssl_set, error_r) < 0) return -1; - master_service_ssl_client_settings_to_iostream_set(ssl_set, ssl_set_r); + ssl_client_settings_to_iostream_set(ssl_set, ssl_set_r); settings_free(ssl_set); return 0; } diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c index bb86e96cf7..8f9be40bc8 100644 --- a/src/lmtp/lmtp-proxy.c +++ b/src/lmtp/lmtp-proxy.c @@ -200,7 +200,7 @@ lmtp_proxy_connection_init_ssl(struct lmtp_proxy_connection *conn, enum smtp_client_connection_ssl_mode *ssl_mode_r, const char **error_r) { - const struct master_service_ssl_settings *master_ssl_set; + const struct ssl_settings *ssl_set; *ssl_mode_r = SMTP_CLIENT_SSL_MODE_NONE; @@ -209,12 +209,10 @@ lmtp_proxy_connection_init_ssl(struct lmtp_proxy_connection *conn, return 0; } - if (settings_get(conn->proxy->client->event, - &master_service_ssl_setting_parser_info, 0, - &master_ssl_set, error_r) < 0) + if (settings_get(conn->proxy->client->event, &ssl_setting_parser_info, + 0, &ssl_set, error_r) < 0) return -1; - master_service_ssl_client_settings_to_iostream_set( - master_ssl_set, ssl_set_r); + ssl_client_settings_to_iostream_set(ssl_set, ssl_set_r); if ((conn->set.set.ssl_flags & AUTH_PROXY_SSL_FLAG_ANY_CERT) != 0) { pool_t pool = pool_alloconly_create("ssl iostream settings", sizeof(**ssl_set_r)); @@ -230,7 +228,7 @@ lmtp_proxy_connection_init_ssl(struct lmtp_proxy_connection *conn, *ssl_mode_r = SMTP_CLIENT_SSL_MODE_IMMEDIATE; else *ssl_mode_r = SMTP_CLIENT_SSL_MODE_STARTTLS; - settings_free(master_ssl_set); + settings_free(ssl_set); return 0; } diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c index fc36dbae2e..e08a060dfb 100644 --- a/src/login-common/client-common.c +++ b/src/login-common/client-common.c @@ -215,10 +215,9 @@ static int client_settings_get(struct client *client, const char **error_r) if (settings_get(client->event, &login_setting_parser_info, 0, &client->set, error_r) < 0 || - settings_get(client->event, &master_service_ssl_setting_parser_info, + settings_get(client->event, &ssl_setting_parser_info, 0, &client->ssl_set, error_r) < 0 || - settings_get(client->event, - &master_service_ssl_server_setting_parser_info, + settings_get(client->event, &ssl_server_setting_parser_info, 0, &client->ssl_server_set, error_r) < 0) { settings_free(client->set); settings_free(client->ssl_set); @@ -662,8 +661,8 @@ static int client_sni_callback(const char *name, const char **error_r, client->ssl_servername_settings_read = TRUE; const struct login_settings *old_set = client->set; - const struct master_service_ssl_settings *old_ssl_set = client->ssl_set; - const struct master_service_ssl_server_settings *old_ssl_server_set = + const struct ssl_settings *old_ssl_set = client->ssl_set; + const struct ssl_server_settings *old_ssl_server_set = client->ssl_server_set; client->set = NULL; client->ssl_set = NULL; @@ -686,7 +685,7 @@ static int client_sni_callback(const char *name, const char **error_r, settings_free(old_ssl_set); settings_free(old_ssl_server_set); - master_service_ssl_server_settings_to_iostream_set(client->ssl_set, + ssl_server_settings_to_iostream_set(client->ssl_set, client->ssl_server_set, &ssl_set); if (ssl_iostream_server_context_cache_get(ssl_set, &ssl_ctx, &error) < 0) { *error_r = t_strdup_printf( @@ -713,7 +712,7 @@ int client_init_ssl(struct client *client) return -1; } - master_service_ssl_server_settings_to_iostream_set(client->ssl_set, + ssl_server_settings_to_iostream_set(client->ssl_set, client->ssl_server_set, &ssl_set); if (ssl_iostream_server_context_cache_get(ssl_set, &ssl_ctx, &error) < 0) { e_error(client->event, diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h index 58aa35f895..e942586671 100644 --- a/src/login-common/client-common.h +++ b/src/login-common/client-common.h @@ -189,8 +189,8 @@ struct client { in_port_t real_local_port, real_remote_port; struct ssl_iostream *ssl_iostream; const struct login_settings *set; - const struct master_service_ssl_settings *ssl_set; - const struct master_service_ssl_server_settings *ssl_server_set; + const struct ssl_settings *ssl_set; + const struct ssl_server_settings *ssl_server_set; const char *session_id, *listener_name, *postlogin_socket_path; const char *local_name; const char *client_cert_common_name; diff --git a/src/login-common/login-common.h b/src/login-common/login-common.h index 41ac2eb831..fea3d2577e 100644 --- a/src/login-common/login-common.h +++ b/src/login-common/login-common.h @@ -59,7 +59,7 @@ extern ARRAY_TYPE(string) global_alt_usernames; extern bool login_ssl_initialized; extern const struct login_settings *global_login_settings; -extern const struct master_service_ssl_settings *global_ssl_settings; +extern const struct ssl_settings *global_ssl_settings; extern const struct ip_addr *login_source_v4_ips; extern unsigned int login_source_v4_ips_idx, login_source_v4_ips_count; diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c index 79f0b35e8f..1c219422b4 100644 --- a/src/login-common/login-proxy.c +++ b/src/login-common/login-proxy.c @@ -1204,8 +1204,7 @@ int login_proxy_starttls(struct login_proxy *proxy) const char *error; bool add_multiplex_istream = FALSE; - master_service_ssl_client_settings_to_iostream_set( - proxy->client->ssl_set, &ssl_set); + ssl_client_settings_to_iostream_set(proxy->client->ssl_set, &ssl_set); pool_t pool = pool_alloconly_create("ssl iostream settings", sizeof(*ssl_set)); ssl_set_copy = p_memdup(pool, ssl_set, sizeof(*ssl_set)); diff --git a/src/login-common/login-settings.h b/src/login-common/login-settings.h index 90f5accb96..4898d386e5 100644 --- a/src/login-common/login-settings.h +++ b/src/login-common/login-settings.h @@ -1,9 +1,6 @@ #ifndef LOGIN_SETTINGS_H #define LOGIN_SETTINGS_H -struct master_service_ssl_settings; -struct master_service_ssl_server_settings; - struct login_settings { pool_t pool; const char *login_trusted_networks; diff --git a/src/login-common/main.c b/src/login-common/main.c index 708e78392e..5428c91cc7 100644 --- a/src/login-common/main.c +++ b/src/login-common/main.c @@ -43,8 +43,8 @@ ARRAY_TYPE(string) global_alt_usernames; bool login_ssl_initialized; const struct login_settings *global_login_settings; -const struct master_service_ssl_settings *global_ssl_settings; -const struct master_service_ssl_server_settings *global_ssl_server_settings; +const struct ssl_settings *global_ssl_settings; +const struct ssl_server_settings *global_ssl_server_settings; void **global_other_settings; static ARRAY(struct ip_addr) login_source_v4_ips_array; @@ -348,7 +348,7 @@ static void login_ssl_init(void) if (strcmp(global_ssl_server_settings->ssl, "no") == 0) return; - master_service_ssl_server_settings_to_iostream_set(global_ssl_settings, + ssl_server_settings_to_iostream_set(global_ssl_settings, global_ssl_server_settings, &ssl_set); if (io_stream_ssl_global_init(ssl_set, &error) < 0) i_fatal("Failed to initialize SSL library: %s", error); @@ -527,10 +527,10 @@ int login_binary_run(struct login_binary *binary, i_fatal("%s", error); global_ssl_settings = settings_get_or_fatal( master_service_get_event(master_service), - &master_service_ssl_setting_parser_info); + &ssl_setting_parser_info); global_ssl_server_settings = settings_get_or_fatal( master_service_get_event(master_service), - &master_service_ssl_server_setting_parser_info); + &ssl_server_setting_parser_info); if (argv[optind] != NULL) login_socket = argv[optind]; diff --git a/src/stats/event-exporter-transport-http-post.c b/src/stats/event-exporter-transport-http-post.c index e40138cbf9..3f557a7c13 100644 --- a/src/stats/event-exporter-transport-http-post.c +++ b/src/stats/event-exporter-transport-http-post.c @@ -52,18 +52,13 @@ void event_export_transport_http_post(const struct exporter *exporter, struct http_client_request *req; if (exporter_http_client == NULL) { - const struct ssl_iostream_settings *ssl_set = NULL; - struct http_client_settings set = { .dns_client_socket_path = "dns-client", }; - if (master_ssl_set != NULL) { - master_service_ssl_client_settings_to_iostream_set( - master_ssl_set, &ssl_set); - set.ssl = ssl_set; - } + if (ssl_set != NULL) + ssl_client_settings_to_iostream_set(ssl_set, &set.ssl); exporter_http_client = http_client_init(&set); - settings_free(ssl_set); + settings_free(set.ssl); } req = http_client_request_url_str(exporter_http_client, "POST", diff --git a/src/stats/main.c b/src/stats/main.c index 482e9cd93b..a3df393bde 100644 --- a/src/stats/main.c +++ b/src/stats/main.c @@ -15,7 +15,7 @@ #include "client-reader.h" #include "client-http.h" -const struct master_service_ssl_settings *master_ssl_set; +const struct ssl_settings *ssl_set; struct stats_metrics *stats_metrics; time_t stats_startup_time; @@ -52,9 +52,9 @@ static void main_init(void) stats_settings = settings_get_or_fatal(master_service_get_event(master_service), &stats_setting_parser_info); - master_ssl_set = + ssl_set = settings_get_or_fatal(master_service_get_event(master_service), - &master_service_ssl_setting_parser_info); + &ssl_setting_parser_info); stats_startup_time = ioloop_time; if (stats_metrics_init(master_service_get_event(master_service), @@ -76,7 +76,7 @@ static void main_deinit(void) stats_event_categories_deinit(); stats_metrics_deinit(&stats_metrics); settings_free(stats_settings); - settings_free(master_ssl_set); + settings_free(ssl_set); } int main(int argc, char *argv[]) diff --git a/src/stats/stats-common.h b/src/stats/stats-common.h index 82a5e96eb8..682b407f59 100644 --- a/src/stats/stats-common.h +++ b/src/stats/stats-common.h @@ -4,7 +4,7 @@ #include "lib.h" #include "stats-settings.h" -extern const struct master_service_ssl_settings *master_ssl_set; +extern const struct ssl_settings *ssl_set; extern struct stats_metrics *stats_metrics; extern time_t stats_startup_time; diff --git a/src/stats/test-stats-common.c b/src/stats/test-stats-common.c index 3ca76c3455..e11d5e119c 100644 --- a/src/stats/test-stats-common.c +++ b/src/stats/test-stats-common.c @@ -15,7 +15,7 @@ struct event_category child_test_category = { }; pool_t test_pool; -const struct master_service_ssl_settings *master_ssl_set = NULL; +const struct ssl_settings *ssl_set = NULL; struct stats_metrics *stats_metrics = NULL; time_t stats_startup_time;