From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 8 Mar 2025 08:17:33 +0000 (+0200)
Subject: imap: Move mailbox_list_index setting to be looked up via imap_settings
X-Git-Tag: 2.4.1~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0587cda322d8538ad934af80fff0eac7ce17b677;p=thirdparty%2Fdovecot%2Fcore.git

imap: Move mailbox_list_index setting to be looked up via imap_settings
---

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 5d1bd44883..e2bbbc43a2 100644
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -98,7 +98,6 @@ struct client *client_create(int fd_in, int fd_out,
 			     const struct imap_settings *set,
 			     const struct smtp_submit_settings *smtp_set)
 {
-	const struct mail_storage_settings *mail_set;
 	struct client *client;
 	pool_t pool;
 
@@ -158,10 +157,9 @@ struct client *client_create(int fd_in, int fd_out,
 	if (!user->fuzzy_search)
 		imap_unset_capability(set_instance, "SEARCH=FUZZY");
 
-	mail_set = mail_user_set_get_storage_set(user);
 	/* NOTIFY is enabled only when mailbox list indexes are enabled,
 	   although even that doesn't necessarily guarantee it always */
-	if (!mail_set->mailbox_list_index)
+	if (!set->mailbox_list_index)
 		imap_unset_capability(set_instance, "NOTIFY");
 
 	const char *error;
diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index 2e5a7d8996..749c4bc0a9 100644
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -66,6 +66,7 @@ const struct setting_keyvalue imap_service_settings_defaults[] = {
 
 static const struct setting_define imap_setting_defines[] = {
 	DEF(BOOL, verbose_proctitle),
+	DEF(BOOL, mailbox_list_index),
 	DEF(STR, rawlog_dir),
 
 	DEF(SIZE_HIDDEN, imap_max_line_length),
@@ -92,6 +93,7 @@ static const struct setting_define imap_setting_defines[] = {
 
 static const struct imap_settings imap_default_settings = {
 	.verbose_proctitle = VERBOSE_PROCTITLE_DEFAULT,
+	.mailbox_list_index = TRUE,
 	.rawlog_dir = "",
 
 	/* RFC-2683 recommends at least 8000 bytes. Some clients however don't
diff --git a/src/imap/imap-settings.h b/src/imap/imap-settings.h
index 9b152d9896..202ea45a30 100644
--- a/src/imap/imap-settings.h
+++ b/src/imap/imap-settings.h
@@ -22,6 +22,7 @@ enum imap_client_fetch_failure {
 struct imap_settings {
 	pool_t pool;
 	bool verbose_proctitle;
+	bool mailbox_list_index;
 	const char *rawlog_dir;
 
 	/* imap: */