From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Fri, 15 Apr 2016 10:14:16 +0000 (+0300)
Subject: imap: add variables to default imap_logout_format
X-Git-Tag: 2.3.0.rc1~3983
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=556d69b89bf0afd1ba53acce4775097e494b6b8b;p=thirdparty%2Fdovecot%2Fcore.git

imap: add variables to default imap_logout_format
---

diff --git a/doc/example-config/conf.d/20-imap.conf b/doc/example-config/conf.d/20-imap.conf
index b7dd95dfa0..f10ae87f4a 100644
--- a/doc/example-config/conf.d/20-imap.conf
+++ b/doc/example-config/conf.d/20-imap.conf
@@ -24,7 +24,10 @@
 #  %{expunged} - Number of mails that client expunged
 #  %{trashed} - Number of mails that client copied/moved to the
 #               special_use=\Trash mailbox.
-#imap_logout_format = in=%i out=%o
+#imap_logout_format = in=%i out=%o del=%{deleted} expunged=%{expunged} \
+#  trashed=%{trashed} hdr_count=%{fetch_hdr_count} \
+#  hdr_bytes=%{fetch_hdr_bytes} body_count=%{fetch_body_count} \
+#  body_bytes=%{fetch_body_bytes}
 
 # Override the IMAP CAPABILITY response. If the value begins with '+',
 # add the given capabilities on top of the defaults (e.g. +XFOO XBAR).
diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index d1668e6910..5355e8fe4d 100644
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -89,7 +89,10 @@ static const struct imap_settings imap_default_settings = {
 	.imap_idle_notify_interval = 2*60,
 	.imap_capability = "",
 	.imap_client_workarounds = "",
-	.imap_logout_format = "in=%i out=%o",
+	.imap_logout_format = "in=%i out=%o deleted=%{deleted} "
+		"expunged=%{expunged} trashed=%{trashed} "
+		"hdr_count=%{fetch_hdr_count} hdr_bytes=%{fetch_hdr_bytes} "
+		"body_count=%{fetch_body_count} body_bytes=%{fetch_body_bytes}",
 	.imap_id_send = "name *",
 	.imap_id_log = "",
 	.imap_metadata = FALSE,