From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Fri, 1 Dec 2023 11:05:42 +0000 (+0000)
Subject: fts: storage - Use fts_settings for autoindex
X-Git-Tag: 2.4.1~1120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=516544be1c1e17efe504458fe68f0fb0823050df;p=thirdparty%2Fdovecot%2Fcore.git

fts: storage - Use fts_settings for autoindex
---

diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index 2eb2811b3c..5030d5eec9 100644
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -662,16 +662,16 @@ static int
 fts_transaction_commit(struct mailbox_transaction_context *t,
 		       struct mail_transaction_commit_changes *changes_r)
 {
-	struct fts_transaction_context *ft = FTS_CONTEXT_REQUIRE(t);
-	struct fts_mailbox *fbox = FTS_CONTEXT_REQUIRE(t->box);
 	struct mailbox *box = t->box;
+	const struct fts_settings *set = fts_user_get_settings(box->storage->user);
+	struct fts_transaction_context *ft = FTS_CONTEXT_REQUIRE(t);
+	struct fts_mailbox *fbox = FTS_CONTEXT_REQUIRE(box);
 	bool autoindex;
 	int ret = 0;
 	const char *error;
 
-	autoindex = ft->mails_saved && !fbox->fts_mailbox_excluded &&
-		mail_user_plugin_getenv_bool(box->storage->user,
-					"fts_autoindex");
+	autoindex = set->autoindex && ft->mails_saved &&
+		    !fbox->fts_mailbox_excluded;
 
 	if (fts_transaction_end(t, &error) < 0) {
 		mail_storage_set_error(t->box->storage, MAIL_ERROR_TEMP,