From e53c29acb0c76abb6484f9babe33c086fbb3e697 Mon Sep 17 00:00:00 2001
From: Bron Gondwana <brong@fastmailteam.com>
Date: Sat, 30 Nov 2024 22:30:53 +1100
Subject: [PATCH] imapoptions: allow twom backend

---
 lib/imapoptions | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/imapoptions b/lib/imapoptions
index 73487ad0ab..b63d089611 100644
--- a/lib/imapoptions
+++ b/lib/imapoptions
@@ -217,7 +217,7 @@ are listed with ``<none>''.
 /* Alternative INBOX spellings that can't be accessed in altnamespace
    otherwise go under here. */
 
-{ "annotation_db", "twoskip", STRINGLIST("skiplist", "twoskip", "zeroskip"), "3.1.6" }
+{ "annotation_db", "twoskip", STRINGLIST("skiplist", "twom", "twoskip", "zeroskip"), "3.1.6" }
 /* The cyrusdb backend to use for mailbox annotations. */
 
 { "annotation_db_path", NULL, STRING, "2.5.0" }
@@ -549,7 +549,7 @@ Blank lines and lines beginning with ``#'' are ignored.
 { "backup_retention", "7d", DURATION, "UNRELEASED", "UNRELEASED" }
 /* Deprecated. No longer used. */
 
-{ "backup_db", "twoskip", STRINGLIST("skiplist", "sql", "twoskip", "zeroskip"), "UNRELEASED", "UNRELEASED" }
+{ "backup_db", "twoskip", STRINGLIST("skiplist", "sql", "twom", "twoskip", "zeroskip"), "UNRELEASED", "UNRELEASED" }
 /* Deprecated. No longer used. */
 
 { "backup_db_path", NULL, STRING, "UNRELEASED", "UNRELEASED" }
@@ -716,7 +716,7 @@ Blank lines and lines beginning with ``#'' are ignored.
    database with ctl_conversationsdb if you change this option on a
    running server, or the counts will be wrong. */
 
-{ "conversations_db", "skiplist", STRINGLIST("skiplist", "sql", "twoskip", "zeroskip"), "3.1.6" }
+{ "conversations_db", "twoskip", STRINGLIST("skiplist", "sql", "twom", "twoskip", "zeroskip"), "3.1.6" }
 /* The cyrusdb backend to use for the per-user conversations database. */
 
 { "conversations_expire_days", NULL, DURATION, "3.1.8", "3.1.8", "conversations_expire_after" }
@@ -911,7 +911,7 @@ Blank lines and lines beginning with ``#'' are ignored.
    specifies the actual key used for iSchedule DKIM signing within the
    domain. */
 
-{ "duplicate_db", "twoskip", STRINGLIST("skiplist", "sql", "twoskip", "zeroskip"), "3.1.6" }
+{ "duplicate_db", "twoskip", STRINGLIST("skiplist", "sql", "twom", "twoskip", "zeroskip"), "3.1.6" }
 /* The cyrusdb backend to use for the duplicate delivery suppression
    and sieve. */
 
@@ -1793,10 +1793,10 @@ Blank lines and lines beginning with ``#'' are ignored.
 .PP
    If no unit is specified, bytes is assumed. */
 
-{ "mboxkey_db", "twoskip", STRINGLIST("skiplist", "twoskip", "zeroskip"), "3.1.6" }
+{ "mboxkey_db", "twoskip", STRINGLIST("skiplist", "twom", "twoskip", "zeroskip"), "3.1.6" }
 /* The cyrusdb backend to use for mailbox keys. */
 
-{ "mboxlist_db", "twoskip", STRINGLIST("flat", "skiplist", "sql", "twoskip", "zeroskip"), "3.1.6" }
+{ "mboxlist_db", "twoskip", STRINGLIST("flat", "skiplist", "sql", "twom", "twoskip", "zeroskip"), "3.1.6" }
 /* The cyrusdb backend to use for the mailbox list. */
 
 { "mboxlist_db_path", NULL, STRING, "2.5.0" }
@@ -2222,7 +2222,7 @@ If all partitions are over that limit, this feature is not used anymore.
 /* Unix domain socket that ptloader listens on.
    (defaults to configdirectory/ptclient/ptsock). */
 
-{ "ptscache_db", "twoskip", STRINGLIST("skiplist", "twoskip", "zeroskip"), "3.1.6" }
+{ "ptscache_db", "twoskip", STRINGLIST("skiplist", "twom", "twoskip", "zeroskip"), "3.1.6" }
 /* The cyrusdb backend to use for the pts cache. */
 
 { "ptscache_db_path", NULL, STRING, "2.5.0" }
@@ -2902,7 +2902,7 @@ product version in the capabilities
    Default is 8192.  If there are more than this many messages appended
    to the mailbox, generate a synthetic partial state and send that. */
 
-{ "sync_cache_db", "twoskip", STRINGLIST("skiplist", "sql", "twoskip", "zeroskip"), "3.3.1" }
+{ "sync_cache_db", "twoskip", STRINGLIST("skiplist", "sql", "twom", "twoskip", "zeroskip"), "3.3.1" }
 /* The cyrusdb backend to use for the replication cache. */
 
 { "sync_cache_db_path", NULL, STRING, "3.3.1" }