lib-master: Don't dup errors to service->set_pool in master_service_settings_read

Use t_strdup() instead.

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index e4d2ffcb96297910df90b079d09fdfcdd1a238d6..eac9f90eac6156f7cbbd95926f6fa7552caa11dd 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -578,7 +578,7 @@ int master_service_settings_read(struct master_service *service,
                                ret = settings_parse_stream_read(parser,
                                                                 istream);
                                if (ret < 0)
-                                       *error_r = p_strdup(service->set_pool,
+                                       *error_r = t_strdup(
                                                settings_parser_get_error(parser));
                        }
                        alarm(0);
@@ -594,7 +594,7 @@ int master_service_settings_read(struct master_service *service,
 
                if (ret != 0) {
                        if (ret > 0) {
-                               *error_r = p_strdup_printf(service->set_pool,
+                               *error_r = t_strdup_printf(
                                        "Timeout reading config from %s", path);
                        }
                        i_close_fd(&fd);
@@ -615,8 +615,7 @@ int master_service_settings_read(struct master_service *service,
 
        if (use_environment || service->keep_environment) {
                if (settings_parse_environ(parser) < 0) {
-                       *error_r = p_strdup(service->set_pool,
-                                       settings_parser_get_error(parser));
+                       *error_r = t_strdup(settings_parser_get_error(parser));
                        settings_parser_deinit(&parser);
                        return -1;
                }
@@ -631,8 +630,7 @@ int master_service_settings_read(struct master_service *service,
        }
 
        if (!settings_parser_check(parser, service->set_pool, &error)) {
-               *error_r = p_strdup_printf(service->set_pool,
-                               "Invalid settings: %s", error);
+               *error_r = t_strdup_printf("Invalid settings: %s", error);
                settings_parser_deinit(&parser);
                return -1;
        }