From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 2 Mar 2021 17:30:23 +0000 (+0200)
Subject: imap: Use internal error for logging FETCH failed disconnection message
X-Git-Tag: 2.3.15~251
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9803254753a73ca63eb104b6c6b8096e93d40c1;p=thirdparty%2Fdovecot%2Fcore.git

imap: Use internal error for logging FETCH failed disconnection message
---

diff --git a/src/imap/cmd-fetch.c b/src/imap/cmd-fetch.c
index 1e4bd2a01f..d05d8d1975 100644
--- a/src/imap/cmd-fetch.c
+++ b/src/imap/cmd-fetch.c
@@ -247,8 +247,12 @@ static bool cmd_fetch_finish(struct imap_fetch_context *ctx,
 			   requests, because many IMAP clients become confused
 			   about what they should on NO. A disconnection causes
 			   less confusion. */
-			client_disconnect_with_error(cmd->client,
-				t_strconcat("FETCH failed: ", client_error, NULL));
+			const char *internal_error =
+				mailbox_get_last_internal_error(cmd->client->mailbox, NULL);
+			client_send_line(cmd->client, t_strconcat(
+				"* BYE FETCH failed: ", client_error, NULL));
+			client_disconnect(cmd->client, t_strconcat(
+				"FETCH failed: ", internal_error, NULL));
 			imap_fetch_free(&ctx);
 			return TRUE;
 		} else {