From: Timo Sirainen Date: Wed, 8 Mar 2023 14:27:03 +0000 (+0200) Subject: lib-master, global: Remove "settings roots" X-Git-Tag: 2.4.0~2237 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=971c1a988110369cf6588d10470b3f3d913c6d6f;p=thirdparty%2Fdovecot%2Fcore.git lib-master, global: Remove "settings roots" It's no longer necessary to know what settings the process will use. --- diff --git a/src/anvil/main.c b/src/anvil/main.c index c1a3a5b97c..0f9594159e 100644 --- a/src/anvil/main.c +++ b/src/anvil/main.c @@ -161,8 +161,7 @@ int main(int argc, char *argv[]) &argc, &argv, ""); if (master_getopt(master_service) > 0) return FATAL_DEFAULT; - if (master_service_settings_read_simple(master_service, - NULL, &error) < 0) + if (master_service_settings_read_simple(master_service, &error) < 0) i_fatal("%s", error); master_service_init_log(master_service); diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c index 070941aaca..ffb883b7bd 100644 --- a/src/auth/auth-settings.c +++ b/src/auth/auth-settings.c @@ -548,15 +548,10 @@ const struct auth_settings * auth_settings_read(const char *service, struct master_service_settings_output *output_r) { - static const struct setting_parser_info *set_roots[] = { - &auth_setting_parser_info, - NULL - }; struct master_service_settings_input input; const char *error; i_zero(&input); - input.roots = set_roots; input.service = service; input.disable_check_settings = TRUE; if (master_service_settings_read(master_service, &input, diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c index 77f3cc93fa..5747601176 100644 --- a/src/dict/dict-expire.c +++ b/src/dict/dict-expire.c @@ -144,10 +144,6 @@ static void main_deinit(void) int main(int argc, char *argv[]) { const enum master_service_flags service_flags = 0; - const struct setting_parser_info *set_roots[] = { - &dict_setting_parser_info, - NULL - }; const char *error; master_service = master_service_init("dict-expire", service_flags, @@ -156,7 +152,6 @@ int main(int argc, char *argv[]) return FATAL_DEFAULT; const struct master_service_settings_input set_input = { - .roots = set_roots, .disable_check_settings = TRUE, }; struct master_service_settings_output output; diff --git a/src/dict/main.c b/src/dict/main.c index 66ba25037e..554f032634 100644 --- a/src/dict/main.c +++ b/src/dict/main.c @@ -143,10 +143,6 @@ static void main_deinit(void) int main(int argc, char *argv[]) { const enum master_service_flags service_flags = 0; - const struct setting_parser_info *set_roots[] = { - &dict_setting_parser_info, - NULL - }; const char *error; master_service = master_service_init("dict", service_flags, @@ -155,7 +151,6 @@ int main(int argc, char *argv[]) return FATAL_DEFAULT; const struct master_service_settings_input set_input = { - .roots = set_roots, .disable_check_settings = TRUE, }; struct master_service_settings_output output; diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c index 2553402c13..a0d9212694 100644 --- a/src/doveadm/client-connection.c +++ b/src/doveadm/client-connection.c @@ -32,16 +32,11 @@ bool doveadm_client_is_allowed_command(const struct doveadm_settings *set, static int client_connection_read_settings(struct client_connection *conn) { - const struct setting_parser_info *set_roots[] = { - &doveadm_setting_parser_info, - NULL - }; struct master_service_settings_input input; struct master_service_settings_output output; const char *error; i_zero(&input); - input.roots = set_roots; input.service = "doveadm"; input.local_ip = conn->local_ip; input.remote_ip = conn->remote_ip; diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c index 483f7ca7b3..84dc418f40 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c @@ -219,17 +219,11 @@ void doveadm_get_ssl_settings(struct ssl_iostream_settings *set_r, pool_t pool) void doveadm_read_settings(void) { - static const struct setting_parser_info *set_roots[] = { - &master_service_ssl_setting_parser_info, - &doveadm_setting_parser_info, - NULL - }; struct master_service_settings_input input; struct master_service_settings_output output; const char *error; i_zero(&input); - input.roots = set_roots; input.service = "doveadm"; input.preserve_user = TRUE; input.preserve_home = TRUE; diff --git a/src/imap-hibernate/main.c b/src/imap-hibernate/main.c index 5702d2b5b0..90d68e6efd 100644 --- a/src/imap-hibernate/main.c +++ b/src/imap-hibernate/main.c @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) } } - if (master_service_settings_read_simple(master_service, NULL, &error) < 0) + if (master_service_settings_read_simple(master_service, &error) < 0) i_fatal("%s", error); master_service_init_log(master_service); diff --git a/src/imap-login/imap-login-client.c b/src/imap-login/imap-login-client.c index 2d9f82dacd..83c2ef1b42 100644 --- a/src/imap-login/imap-login-client.c +++ b/src/imap-login/imap-login-client.c @@ -523,7 +523,6 @@ imap_client_notify_disconnect(struct client *client, static void imap_login_preinit(void) { - login_set_roots = imap_login_setting_roots; } static const struct imap_login_command imap_login_commands[] = { diff --git a/src/imap-login/imap-login-settings.c b/src/imap-login/imap-login-settings.c index d32eb8c3cd..5ebab20103 100644 --- a/src/imap-login/imap-login-settings.c +++ b/src/imap-login/imap-login-settings.c @@ -109,9 +109,3 @@ const struct setting_parser_info imap_login_setting_parser_info = { .pool_offset1 = 1 + offsetof(struct imap_login_settings, pool), .dependencies = imap_login_setting_dependencies }; - -const struct setting_parser_info *imap_login_setting_roots[] = { - &login_setting_parser_info, - &imap_login_setting_parser_info, - NULL -}; diff --git a/src/imap-login/imap-login-settings.h b/src/imap-login/imap-login-settings.h index 00ca7202ea..e85b0ff403 100644 --- a/src/imap-login/imap-login-settings.h +++ b/src/imap-login/imap-login-settings.h @@ -9,7 +9,6 @@ struct imap_login_settings { bool imap_id_retain; }; -extern const struct setting_parser_info *imap_login_setting_roots[]; extern const struct setting_parser_info imap_login_setting_parser_info; #endif diff --git a/src/imap-urlauth-login/Makefile.am b/src/imap-urlauth-login/Makefile.am index 28b1723825..d0c0d977d5 100644 --- a/src/imap-urlauth-login/Makefile.am +++ b/src/imap-urlauth-login/Makefile.am @@ -28,6 +28,3 @@ imap_urlauth_login_DEPENDENCIES = \ imap_urlauth_login_SOURCES = \ imap-urlauth-login.c \ imap-urlauth-login-settings.c - -noinst_HEADERS = \ - imap-urlauth-login-settings.h diff --git a/src/imap-urlauth-login/imap-urlauth-login-settings.c b/src/imap-urlauth-login/imap-urlauth-login-settings.c index 7167a332c1..45d6fd6193 100644 --- a/src/imap-urlauth-login/imap-urlauth-login-settings.c +++ b/src/imap-urlauth-login/imap-urlauth-login-settings.c @@ -5,7 +5,6 @@ #include "settings-parser.h" #include "service-settings.h" #include "login-settings.h" -#include "imap-urlauth-login-settings.h" #include @@ -69,9 +68,3 @@ const struct setting_parser_info imap_urlauth_login_setting_parser_info = { .dependencies = imap_urlauth_login_setting_dependencies }; - -const struct setting_parser_info *imap_urlauth_login_setting_roots[] = { - &login_setting_parser_info, - &imap_urlauth_login_setting_parser_info, - NULL -}; diff --git a/src/imap-urlauth-login/imap-urlauth-login-settings.h b/src/imap-urlauth-login/imap-urlauth-login-settings.h deleted file mode 100644 index 775638abc8..0000000000 --- a/src/imap-urlauth-login/imap-urlauth-login-settings.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef IMAP_URLAUTH_LOGIN_SETTINGS_H -#define IMAP_URLAUTH_LOGIN_SETTINGS_H - -extern const struct setting_parser_info *imap_urlauth_login_setting_roots[]; - -#endif diff --git a/src/imap-urlauth-login/imap-urlauth-login.c b/src/imap-urlauth-login/imap-urlauth-login.c index cb4f8e8d3e..2de90c08c3 100644 --- a/src/imap-urlauth-login/imap-urlauth-login.c +++ b/src/imap-urlauth-login/imap-urlauth-login.c @@ -11,7 +11,6 @@ #include "master-service.h" #include "auth-client.h" #include "client-common.h" -#include "imap-urlauth-login-settings.h" #define IMAP_URLAUTH_PROTOCOL_MAJOR_VERSION 2 #define IMAP_URLAUTH_PROTOCOL_MINOR_VERSION 0 @@ -164,7 +163,6 @@ static void imap_urlauth_client_notify_auth_ready(struct client *client) static void imap_urlauth_login_preinit(void) { - login_set_roots = imap_urlauth_login_setting_roots; } static void imap_urlauth_login_init(void) diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c index 882a6faba5..d356b8cc2f 100644 --- a/src/imap-urlauth/imap-urlauth.c +++ b/src/imap-urlauth/imap-urlauth.c @@ -211,10 +211,6 @@ static void client_connected(struct master_service_connection *conn) int main(int argc, char *argv[]) { - static const struct setting_parser_info *set_roots[] = { - &imap_urlauth_setting_parser_info, - NULL - }; struct login_server_settings login_set; struct master_service_settings_input input; struct master_service_settings_output output; @@ -253,7 +249,6 @@ int main(int argc, char *argv[]) master_service_init_log(master_service); i_zero(&input); - input.roots = set_roots; input.service = "imap-urlauth"; input.disable_check_settings = TRUE; if (master_service_settings_read(master_service, &input, &output, diff --git a/src/indexer/indexer.c b/src/indexer/indexer.c index d789c25cf2..6b3997a5fd 100644 --- a/src/indexer/indexer.c +++ b/src/indexer/indexer.c @@ -109,8 +109,7 @@ int main(int argc, char *argv[]) if (master_getopt(master_service) > 0) return FATAL_DEFAULT; - if (master_service_settings_read_simple(master_service, NULL, - &error) < 0) + if (master_service_settings_read_simple(master_service, &error) < 0) i_fatal("%s", error); set = master_service_get_service_settings(master_service); diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c index 73d59aa04f..d724d530ed 100644 --- a/src/lib-master/master-service-settings.c +++ b/src/lib-master/master-service-settings.c @@ -762,14 +762,12 @@ int master_service_settings_read(struct master_service *service, } int master_service_settings_read_simple(struct master_service *service, - const struct setting_parser_info **roots, const char **error_r) { struct master_service_settings_input input; struct master_service_settings_output output; i_zero(&input); - input.roots = roots; return master_service_settings_read(service, &input, &output, error_r); } diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h index 783b7f9d3f..e2d9567d7b 100644 --- a/src/lib-master/master-service-settings.h +++ b/src/lib-master/master-service-settings.h @@ -52,7 +52,6 @@ struct master_service_settings { }; struct master_service_settings_input { - const struct setting_parser_info *const *roots; const char *config_path; bool preserve_environment; bool preserve_user; @@ -136,8 +135,7 @@ int master_service_settings_read(struct master_service *service, struct master_service_settings_output *output_r, const char **error_r); int master_service_settings_read_simple(struct master_service *service, - const struct setting_parser_info **roots, - const char **error_r) ATTR_NULL(2); + const char **error_r); const struct master_service_settings * master_service_get_service_settings(struct master_service *service); diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index cd720b3aea..2109ac4148 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -967,7 +967,6 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx, mail_storage_service_add_storage_set_roots(ctx); i_zero(&set_input); - set_input.roots = mail_storage_service_get_set_roots(ctx); set_input.preserve_user = TRUE; /* settings reader may exec doveconf, which is going to clear environment, and if we're not doing a userdb lookup we want to diff --git a/src/log/main.c b/src/log/main.c index 1d031ce168..7cc6a90612 100644 --- a/src/log/main.c +++ b/src/log/main.c @@ -79,8 +79,7 @@ int main(int argc, char *argv[]) if (master_getopt(master_service) > 0) return FATAL_DEFAULT; - if (master_service_settings_read_simple(master_service, - NULL, &error) < 0) + if (master_service_settings_read_simple(master_service, &error) < 0) i_fatal("%s", error); master_service_init_log_with_prefix(master_service, global_log_prefix); diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c index 629d143cc7..9b76be3c01 100644 --- a/src/login-common/login-settings.c +++ b/src/login-common/login-settings.c @@ -86,13 +86,6 @@ const struct setting_parser_info login_setting_parser_info = { .check_func = login_settings_check }; -static const struct setting_parser_info *default_login_set_roots[] = { - &login_setting_parser_info, - NULL -}; - -const struct setting_parser_info **login_set_roots = default_login_set_roots; - /* */ static bool login_settings_check(void *_set, pool_t pool, const char **error_r) @@ -119,7 +112,6 @@ int login_settings_read(const struct ip_addr *local_ip, struct master_service_settings_output output; i_zero(&input); - input.roots = login_set_roots; input.service = login_binary->protocol; input.local_name = local_name; input.disable_check_settings = TRUE; diff --git a/src/login-common/login-settings.h b/src/login-common/login-settings.h index 73f204d7a3..e41a714cd9 100644 --- a/src/login-common/login-settings.h +++ b/src/login-common/login-settings.h @@ -36,7 +36,6 @@ struct login_settings { char *const *log_format_elements_split; }; -extern const struct setting_parser_info **login_set_roots; extern const struct setting_parser_info login_setting_parser_info; int login_settings_read(const struct ip_addr *local_ip, diff --git a/src/master/main.c b/src/master/main.c index edbfcb00ec..4a0cef741b 100644 --- a/src/master/main.c +++ b/src/master/main.c @@ -75,11 +75,6 @@ static pool_t delayed_errors_pool; static failure_callback_t *orig_fatal_callback; static failure_callback_t *orig_error_callback; -static const struct setting_parser_info *set_roots[] = { - &master_setting_parser_info, - NULL -}; - void process_exec(const char *cmd) { const char *executable, *p, **argv; @@ -417,7 +412,6 @@ sig_settings_reload(const siginfo_t *si ATTR_UNUSED, } i_zero(&input); - input.roots = set_roots; input.config_path = services_get_config_socket_path(services); input.never_exec = TRUE; input.reload_config = TRUE; @@ -512,7 +506,6 @@ static const struct master_settings *master_settings_read(void) const char *error; i_zero(&input); - input.roots = set_roots; input.preserve_environment = TRUE; input.always_exec = TRUE; input.return_config_fd = TRUE; diff --git a/src/plugins/mail-crypt/mail-crypt-pluginenv.c b/src/plugins/mail-crypt/mail-crypt-pluginenv.c index be814b59d5..c5ac66b06a 100644 --- a/src/plugins/mail-crypt/mail-crypt-pluginenv.c +++ b/src/plugins/mail-crypt/mail-crypt-pluginenv.c @@ -12,16 +12,11 @@ static const struct fs_crypt_settings * fs_crypt_load_settings(void) { - static const struct setting_parser_info *set_roots[] = { - &fs_crypt_setting_parser_info, - NULL - }; struct master_service_settings_input input; struct master_service_settings_output output; const char *error; i_zero(&input); - input.roots = set_roots; input.service = "fs-crypt"; input.disable_check_settings = TRUE; if (master_service_settings_read(master_service, &input, diff --git a/src/pop3-login/Makefile.am b/src/pop3-login/Makefile.am index 135d24e34a..1c87773e36 100644 --- a/src/pop3-login/Makefile.am +++ b/src/pop3-login/Makefile.am @@ -32,5 +32,4 @@ pop3_login_SOURCES = \ noinst_HEADERS = \ client.h \ client-authenticate.h \ - pop3-login-settings.h \ pop3-proxy.h diff --git a/src/pop3-login/client.c b/src/pop3-login/client.c index f90a5387b4..546807b6d3 100644 --- a/src/pop3-login/client.c +++ b/src/pop3-login/client.c @@ -17,7 +17,6 @@ #include "client-authenticate.h" #include "auth-client.h" #include "pop3-proxy.h" -#include "pop3-login-settings.h" #include @@ -335,7 +334,6 @@ static void pop3_login_die(void) static void pop3_login_preinit(void) { - login_set_roots = pop3_login_setting_roots; } static void pop3_login_init(void) diff --git a/src/pop3-login/pop3-login-settings.c b/src/pop3-login/pop3-login-settings.c index 329c426c2c..23884b52e4 100644 --- a/src/pop3-login/pop3-login-settings.c +++ b/src/pop3-login/pop3-login-settings.c @@ -6,7 +6,6 @@ #include "service-settings.h" #include "login-settings.h" #include "pop3-protocol.h" -#include "pop3-login-settings.h" #include @@ -91,9 +90,3 @@ const struct setting_parser_info pop3_login_setting_parser_info = { .dependencies = pop3_login_setting_dependencies }; - -const struct setting_parser_info *pop3_login_setting_roots[] = { - &login_setting_parser_info, - &pop3_login_setting_parser_info, - NULL -}; diff --git a/src/pop3-login/pop3-login-settings.h b/src/pop3-login/pop3-login-settings.h deleted file mode 100644 index 1c497eb5e1..0000000000 --- a/src/pop3-login/pop3-login-settings.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POP3_LOGIN_SETTINGS_H -#define POP3_LOGIN_SETTINGS_H - -extern const struct setting_parser_info *pop3_login_setting_roots[]; - -#endif diff --git a/src/stats/main.c b/src/stats/main.c index b076592c14..0ff12a8c32 100644 --- a/src/stats/main.c +++ b/src/stats/main.c @@ -74,10 +74,6 @@ static void main_deinit(void) int main(int argc, char *argv[]) { - const struct setting_parser_info *set_roots[] = { - &stats_setting_parser_info, - NULL - }; const enum master_service_flags service_flags = MASTER_SERVICE_FLAG_NO_SSL_INIT | MASTER_SERVICE_FLAG_DONT_SEND_STATS | @@ -91,7 +87,6 @@ int main(int argc, char *argv[]) return FATAL_DEFAULT; const struct master_service_settings_input set_input = { - .roots = set_roots, .disable_check_settings = TRUE, }; struct master_service_settings_output output; diff --git a/src/submission-login/client.c b/src/submission-login/client.c index 95cb95ab21..993a2bb6af 100644 --- a/src/submission-login/client.c +++ b/src/submission-login/client.c @@ -252,7 +252,6 @@ static void submission_login_die(void) static void submission_login_preinit(void) { - login_set_roots = submission_login_setting_roots; } static void submission_login_init(void) diff --git a/src/submission-login/submission-login-settings.c b/src/submission-login/submission-login-settings.c index d34484b1a3..088a8638bb 100644 --- a/src/submission-login/submission-login-settings.c +++ b/src/submission-login/submission-login-settings.c @@ -118,12 +118,6 @@ const struct setting_parser_info submission_login_setting_parser_info = { .dependencies = submission_login_setting_dependencies }; -const struct setting_parser_info *submission_login_setting_roots[] = { - &login_setting_parser_info, - &submission_login_setting_parser_info, - NULL -}; - /* */ struct submission_login_client_workaround_list { const char *name; diff --git a/src/submission-login/submission-login-settings.h b/src/submission-login/submission-login-settings.h index f4f7c2c859..18fb896f96 100644 --- a/src/submission-login/submission-login-settings.h +++ b/src/submission-login/submission-login-settings.h @@ -20,7 +20,6 @@ struct submission_login_settings { enum submission_login_client_workarounds parsed_workarounds; }; -extern const struct setting_parser_info *submission_login_setting_roots[]; extern const struct setting_parser_info submission_login_setting_parser_info; #endif