From: Timo Sirainen Date: Thu, 19 Jan 2023 20:13:38 +0000 (+0200) Subject: global: Remove unnecessary "Error reading configuration:" log prefixes X-Git-Tag: 2.4.0~2348 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60534739fe37d600dbc47facff59cd236ec4514b;p=thirdparty%2Fdovecot%2Fcore.git global: Remove unnecessary "Error reading configuration:" log prefixes master_service_settings_read*() already adds them. --- diff --git a/src/anvil/main.c b/src/anvil/main.c index 9ba943db8b..c1a3a5b97c 100644 --- a/src/anvil/main.c +++ b/src/anvil/main.c @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) return FATAL_DEFAULT; if (master_service_settings_read_simple(master_service, NULL, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); master_service_init_log(master_service); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c index 56a10374b8..44f7b55860 100644 --- a/src/auth/auth-settings.c +++ b/src/auth/auth-settings.c @@ -569,7 +569,7 @@ auth_settings_read(const char *service, pool_t pool, input.service = service; if (master_service_settings_read(master_service, &input, output_r, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); pool_ref(pool); set_parser = settings_parser_dup(master_service->set_parser, pool); diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c index 58766e9115..8b0b66b8d2 100644 --- a/src/dict/dict-expire.c +++ b/src/dict/dict-expire.c @@ -160,7 +160,7 @@ int main(int argc, char *argv[]) struct master_service_settings_output output; if (master_service_settings_read(master_service, &set_input, &output, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); master_service_init_log_with_pid(master_service); main_preinit(); diff --git a/src/dict/main.c b/src/dict/main.c index de502cd204..54f3a1d480 100644 --- a/src/dict/main.c +++ b/src/dict/main.c @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, set_roots, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); master_service_init_log_with_pid(master_service); main_preinit(); diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c index aca3ffe639..60f5be2aec 100644 --- a/src/doveadm/client-connection.c +++ b/src/doveadm/client-connection.c @@ -48,7 +48,7 @@ static int client_connection_read_settings(struct client_connection *conn) if (master_service_settings_read(master_service, &input, &output, &error) < 0) { - e_error(conn->event, "Error reading configuration: %s", error); + e_error(conn->event, "%s", error); return -1; } conn->set = master_service_settings_get_root_set_dup(master_service, diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c index c25bf62ba9..08c8281aa7 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c @@ -260,7 +260,7 @@ void doveadm_read_settings(void) input.return_config_fd = TRUE; /* for doveadm exec */ if (master_service_settings_read(master_service, &input, &output, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); i_assert(global_config_fd == -1); global_config_fd = output.config_fd; fd_close_on_exec(output.config_fd, TRUE); diff --git a/src/imap-hibernate/main.c b/src/imap-hibernate/main.c index 2221d906a8..5702d2b5b0 100644 --- a/src/imap-hibernate/main.c +++ b/src/imap-hibernate/main.c @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) } if (master_service_settings_read_simple(master_service, NULL, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); master_service_init_log(master_service); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); diff --git a/src/imap-urlauth/imap-urlauth.c b/src/imap-urlauth/imap-urlauth.c index c3ef08a183..3a843488a6 100644 --- a/src/imap-urlauth/imap-urlauth.c +++ b/src/imap-urlauth/imap-urlauth.c @@ -257,7 +257,7 @@ int main(int argc, char *argv[]) input.service = "imap-urlauth"; if (master_service_settings_read(master_service, &input, &output, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); imap_urlauth_settings = master_service_settings_get_root_set(master_service, diff --git a/src/indexer/indexer.c b/src/indexer/indexer.c index 532debfc18..d789c25cf2 100644 --- a/src/indexer/indexer.c +++ b/src/indexer/indexer.c @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, NULL, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); set = master_service_get_service_settings(master_service); master_service_init_log(master_service); diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index 4e968fdff3..a071a57b38 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -1107,8 +1107,6 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx, if (master_service_settings_read(ctx->service, &set_input, &set_output, error_r) < 0) { - *error_r = t_strdup_printf("Error reading configuration: %s", - *error_r); ctx->config_permission_denied = set_output.permission_denied; return -1; } diff --git a/src/lmtp/main.c b/src/lmtp/main.c index ee4066c4cf..c3f788a135 100644 --- a/src/lmtp/main.c +++ b/src/lmtp/main.c @@ -71,7 +71,7 @@ static void drop_privileges(void) input.service = "lmtp"; if (master_service_settings_read(master_service, &input, &output, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); } diff --git a/src/log/main.c b/src/log/main.c index a1cbe73dfb..1d031ce168 100644 --- a/src/log/main.c +++ b/src/log/main.c @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, NULL, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); master_service_init_log_with_prefix(master_service, global_log_prefix); verbose_proctitle = master_service_get_service_settings(master_service)->verbose_proctitle; diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c index a2cab493a7..0e56d803e6 100644 --- a/src/login-common/login-settings.c +++ b/src/login-common/login-settings.c @@ -182,7 +182,7 @@ login_settings_read_real( if (master_service_settings_read(master_service, &input, &output, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); parser = master_service_get_settings_parser(master_service); for (count = 0; input.roots[count] != NULL; count++) ; diff --git a/src/master/main.c b/src/master/main.c index 2dc71a77a1..f6a2e1c02e 100644 --- a/src/master/main.c +++ b/src/master/main.c @@ -424,7 +424,7 @@ sig_settings_reload(const siginfo_t *si ATTR_UNUSED, input.return_config_fd = TRUE; if (master_service_settings_read(master_service, &input, &output, &error) < 0) { - i_error("Error reading configuration: %s", error); + i_error("%s", error); i_sd_notify(0, "READY=1"); return; } @@ -510,7 +510,7 @@ static struct master_settings *master_settings_read(void) input.return_config_fd = TRUE; if (master_service_settings_read(master_service, &input, &output, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); global_config_fd = output.config_fd; fd_close_on_exec(global_config_fd, TRUE); return master_service_settings_get_root_set(master_service, diff --git a/src/plugins/mail-crypt/mail-crypt-pluginenv.c b/src/plugins/mail-crypt/mail-crypt-pluginenv.c index f3ce7274c9..08203a8157 100644 --- a/src/plugins/mail-crypt/mail-crypt-pluginenv.c +++ b/src/plugins/mail-crypt/mail-crypt-pluginenv.c @@ -25,7 +25,7 @@ fs_crypt_load_settings(void) input.service = "fs-crypt"; if (master_service_settings_read(master_service, &input, &output, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); return master_service_settings_get_root_set(master_service, &fs_crypt_setting_parser_info); diff --git a/src/stats/main.c b/src/stats/main.c index 67c9e7d7e2..7502b4d62b 100644 --- a/src/stats/main.c +++ b/src/stats/main.c @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) return FATAL_DEFAULT; if (master_service_settings_read_simple(master_service, set_roots, &error) < 0) - i_fatal("Error reading configuration: %s", error); + i_fatal("%s", error); master_service_init_log(master_service); master_service_set_die_callback(master_service, stats_die);