From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 17 Aug 2020 16:16:01 +0000 (+0300)
Subject: imap: Add "mailbox" field to successful imap_client_unhibernated event
X-Git-Tag: 2.3.13~352
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ab580a6e50d9a76c32e21be39c6505f67d0232c;p=thirdparty%2Fdovecot%2Fcore.git

imap: Add "mailbox" field to successful imap_client_unhibernated event
---

diff --git a/src/imap/imap-master-client.c b/src/imap/imap-master-client.c
index addf6759a6..9b4cd97b6d 100644
--- a/src/imap/imap-master-client.c
+++ b/src/imap/imap-master-client.c
@@ -318,6 +318,12 @@ imap_master_client_input_args(struct connection *conn, const char *const *args,
 		client_destroy(imap_client, "Client state initialization failed");
 		return -1;
 	}
+	if (imap_client->mailbox != NULL) {
+		/* Would be nice to set this earlier, but the previous errors
+		   happen rarely enough that it shouldn't really matter. */
+		event_add_str(event, "mailbox",
+			      mailbox_get_vname(imap_client->mailbox));
+	}
 
 	if (master_input.tag != NULL)
 		imap_state_import_idle_cmd_tag(imap_client, master_input.tag);