From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 2 Aug 2017 07:54:27 +0000 (+0300)
Subject: imapc: Add imapc_features=send-id to send ID x-session-ext-id
X-Git-Tag: 2.3.0.rc1~1192
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c8055b25beef96e7be25895bac34f3eda7ceca1;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Add imapc_features=send-id to send ID x-session-ext-id
---

diff --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-storage/index/imapc/imapc-settings.c
index 6c3f84a0fb..48f27372f7 100644
--- a/src/lib-storage/index/imapc/imapc-settings.c
+++ b/src/lib-storage/index/imapc/imapc-settings.c
@@ -102,6 +102,7 @@ static const struct imapc_feature_list imapc_feature_list[] = {
 	{ "modseq", IMAPC_FEATURE_MODSEQ },
 	{ "delay-login", IMAPC_FEATURE_DELAY_LOGIN },
 	{ "fetch-bodystructure", IMAPC_FEATURE_FETCH_BODYSTRUCTURE },
+	{ "send-id", IMAPC_FEATURE_SEND_ID },
 	{ NULL, 0 }
 };
 
diff --git a/src/lib-storage/index/imapc/imapc-settings.h b/src/lib-storage/index/imapc/imapc-settings.h
index 8210bbe072..9850f78f85 100644
--- a/src/lib-storage/index/imapc/imapc-settings.h
+++ b/src/lib-storage/index/imapc/imapc-settings.h
@@ -18,6 +18,7 @@ enum imapc_features {
 	IMAPC_FEATURE_MODSEQ			= 0x400,
 	IMAPC_FEATURE_DELAY_LOGIN		= 0x800,
 	IMAPC_FEATURE_FETCH_BODYSTRUCTURE	= 0x1000,
+	IMAPC_FEATURE_SEND_ID			= 0x2000,
 };
 /* </settings checks> */
 
diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index 80bfd49564..bba9ce76a5 100644
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -323,6 +323,8 @@ int imapc_storage_client_create(struct mail_namespace *ns,
 	set.debug = mail_set->mail_debug;
 	set.rawlog_dir = mail_user_home_expand(ns->user,
 					       imapc_set->imapc_rawlog_dir);
+	if ((imapc_set->parsed_features & IMAPC_FEATURE_SEND_ID) != 0)
+		set.session_id_prefix = ns->user->session_id;
 
 	str = t_str_new(128);
 	mail_user_set_get_temp_prefix(str, ns->user->set);