From f976b9107ac06c622ed1a22b70207da35062cdd2 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 11 May 2024 00:06:49 +0300 Subject: [PATCH] fts: Use fts_settings for message_max_size --- src/plugins/fts/fts-user.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/plugins/fts/fts-user.c b/src/plugins/fts/fts-user.c index 5ae6e39ff3..19afa0c387 100644 --- a/src/plugins/fts/fts-user.c +++ b/src/plugins/fts/fts-user.c @@ -28,8 +28,6 @@ struct fts_user { ARRAY_TYPE(fts_user_language) languages, data_languages; struct mailbox_match_plugin *autoindex_exclude; - - size_t fts_message_max_size; }; static MODULE_CONTEXT_DEFINE_INIT(fts_user_module, @@ -401,7 +399,7 @@ fts_mail_user_init_libfts(struct mail_user *user, struct fts_user *fuser, size_t fts_mail_user_message_max_size(struct mail_user *user) { struct fts_user *fuser = FTS_USER_CONTEXT_REQUIRE(user); - return fuser->fts_message_max_size; + return fuser->set->message_max_size; } int fts_mail_user_init(struct mail_user *user, bool initialize_libfts, @@ -434,19 +432,6 @@ int fts_mail_user_init(struct mail_user *user, bool initialize_libfts, fuser->autoindex_exclude = mailbox_match_plugin_init(user, "fts_autoindex_exclude"); - const char *fts_max_size_setting = - mail_user_plugin_getenv(user, "fts_message_max_size"); - - if (fts_max_size_setting != NULL) { - const char *error; - if (str_parse_get_size(fts_max_size_setting, - &fuser->fts_message_max_size, &error) < 0) { - *error_r = t_strdup_printf("Cannot parse fts_message_max_size: %s", error); - fts_user_free(fuser); - return -1; - } - } - MODULE_CONTEXT_SET(user, fts_user_module, fuser); return 0; } -- 2.47.3