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 c8ffeafc4324f009c7d75c2e38ea71814b1af003..49102f87b20589a89f985c5a20b375134b6de0ed 100644 (file)
--- 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 747b7eb8d7652c131491d90e7813f261badeb288..35ae2de0829106a6d91c019285f7938e2f3eb965 100644 (file)
--- 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.");
 }