From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 2 Mar 2021 15:08:53 +0000 (+0200)
Subject: imap: Fix using mail_log_prefix is used when client disconnects during server shutdown
X-Git-Tag: 2.3.15~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=055a98fa40ecb4aa8194f695f6a51971bf5047bc;p=thirdparty%2Fdovecot%2Fcore.git

imap: Fix using mail_log_prefix is used when client disconnects during server shutdown
---

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index c8ffeafc43..49102f87b2 100644
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -1627,8 +1627,8 @@ void clients_init(void)
 void clients_destroy_all(void)
 {
 	while (imap_clients != NULL) {
-		client_send_line(imap_clients, "* BYE Server shutting down.");
 		mail_storage_service_io_activate_user(imap_clients->service_user);
+		client_send_line(imap_clients, "* BYE Server shutting down.");
 		client_destroy(imap_clients, "Server shutting down.");
 	}
 }
diff --git a/src/imap/main.c b/src/imap/main.c
index 747b7eb8d7..35ae2de082 100644
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -124,8 +124,8 @@ static void client_kill_idle(struct client *client)
 	if (client->output_cmd_lock != NULL)
 		return;
 
-	client_send_line(client, "* BYE Server shutting down.");
 	mail_storage_service_io_activate_user(client->service_user);
+	client_send_line(client, "* BYE Server shutting down.");
 	client_destroy(client, "Server shutting down.");
 }