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 9ba943db8beccd02386f8e8773894be3bce4fa59..c1a3a5b97c4e73da585d2521687050945fe912f0 100644 (file)
--- 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 56a10374b87d30ac9aef57bec20ec670ef5b394f..44f7b55860790d7405324217221f7a12fc2d37a7 100644 (file)
--- 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 58766e91154a2e6691b23c26789e744501bafe3b..8b0b66b8d2ece0ebcab27446e347c9bac9f4b01f 100644 (file)
--- 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 de502cd204d638aad4c4960634ac68c8e233686f..54f3a1d4801036d936efbec6670dbeef3578aa8f 100644 (file)
--- 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 aca3ffe6392af496f77aa46ec843b5acc6db8f45..60f5be2aec121ae1d2a1ad03b96ba6fc54d4c23f 100644 (file)
--- 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 c25bf62ba9f1c974b56667e7f1fea1d6bddf48cf..08c8281aa760b030306dc3d1775b861b029e14fc 100644 (file)
--- 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 2221d906a899cc9004823e4b939767bccf8bba23..5702d2b5b0f0649d1efe96cca9a760b937702177 100644 (file)
--- 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 c3ef08a183634149e0fe7656670af8db1e996bff..3a843488a6036dbcda929e90e3a9f866714fad28 100644 (file)
--- 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 532debfc1821e530988edd5c1f573682548308ea..d789c25cf226ddc9a49a4626986757cb363e0e37 100644 (file)
--- 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 4e968fdff3eb559d1bbdd2de2a8784fe5078d1ad..a071a57b387a471edb429116874e67944d33cb55 100644 (file)
--- 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 ee4066c4cf54fd788f4a647e51e70b9deb32831b..c3f788a13590e772fc796e9a277bcef439ad4cbb 100644 (file)
--- 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 a1cbe73dfb425e363a7cbd19c62c66fb0219efbe..1d031ce168e4d778ad487b56e9246cabc1f60f43 100644 (file)
--- 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 a2cab493a703409c0abf2614161913fc2cb9216f..0e56d803e60a64fde0b96061720b1979adc0e6b4 100644 (file)
--- 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 2dc71a77a164c16d59726245a5888e5de0fe7918..f6a2e1c02ed81ceaf40bb8c3a7ce971ec37ec122 100644 (file)
--- 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 f3ce7274c9c9aa1582ceb7a4d9f917c26a4a6374..08203a815797f84281393c26fa02eee3b9f1d93e 100644 (file)
--- 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 67c9e7d7e2bb1f462712dca416df2f34b4bd6ee1..7502b4d62b75c5a5d70c4aae0ec72755cd3d068a 100644 (file)
--- 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);