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 6c3f84a0fbd709ce0485c3f7a49c93ff9ea2a11a..48f27372f730ccf87451a6f80af51abc0ca6888f 100644 (file)
--- 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 8210bbe072dd8eb4d86cc7dcd0cbaa031da6ccb4..9850f78f85971430636762a25b5e8d5f502795c4 100644 (file)
--- 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 80bfd495646820d177a79bd7f01681c3366384cf..bba9ce76a518861f271b21293e9c491b9d0a6528 100644 (file)
--- 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);