From f2a06ed48f378ab1837040b04c2999fffb735f22 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Sun, 6 Jan 2019 12:11:26 +0100 Subject: [PATCH] lib-storage: mail-storage-service: Fix failure prefix composition in mail_storage_service_lookup(). It produced a prefix without the required ": " suffix and in one case it produced a spurious comma. --- src/lib-storage/mail-storage-service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index 2db2606a01..fd4dfcc9ae 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -1415,7 +1415,7 @@ int mail_storage_service_lookup(struct mail_storage_service_ctx *ctx, input->session_id != NULL ? input->session_id : (input->session_id_prefix != NULL ? input->session_id_prefix : NULL); - i_set_failure_prefix("%s(%s%s,%s)", + i_set_failure_prefix("%s(%s%s%s): ", master_service_get_name(ctx->service), input->username, session_id == NULL ? "" : t_strdup_printf(",%s", session_id), input->remote_ip.family == 0 ? "" : @@ -1425,7 +1425,7 @@ int mail_storage_service_lookup(struct mail_storage_service_ctx *ctx, /* we might be here because we're doing a user lookup for a shared user. the log prefix is likely already usable, so just append our own without replacing the whole thing. */ - i_set_failure_prefix("%suser-lookup(%s)", + i_set_failure_prefix("%suser-lookup(%s): ", old_log_prefix, input->username); update_log_prefix = FALSE; } -- 2.47.3