dovecot-1.1: Flags weren't passed correctly to squat.

dovecot at dovecot.org dovecot at dovecot.org
Sun Mar 9 01:10:19 EET 2008


details:   http://hg.dovecot.org/dovecot-1.1/rev/9d6d555950dd
changeset: 7383:9d6d555950dd
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Mar 09 01:07:08 2008 +0200
description:
Flags weren't passed correctly to squat.

diffstat:

1 file changed, 9 insertions(+), 5 deletions(-)
src/plugins/fts-squat/fts-backend-squat.c |   14 +++++++++-----

diffs (37 lines):

diff -r 631fd6f25e41 -r 9d6d555950dd src/plugins/fts-squat/fts-backend-squat.c
--- a/src/plugins/fts-squat/fts-backend-squat.c	Sat Mar 08 14:16:43 2008 +0200
+++ b/src/plugins/fts-squat/fts-backend-squat.c	Sun Mar 09 01:07:08 2008 +0200
@@ -25,7 +25,7 @@ static struct fts_backend *fts_backend_s
 	struct mail_storage *storage;
 	struct mailbox_status status;
 	const char *path;
-	bool mmap_disable;
+	enum squat_index_flags flags = 0;
 
 	storage = mailbox_get_storage(box);
 	path = mail_storage_get_mailbox_index_dir(storage,
@@ -36,16 +36,20 @@ static struct fts_backend *fts_backend_s
 	}
 
 	mailbox_get_status(box, STATUS_UIDVALIDITY, &status);
-	mmap_disable = (storage->flags &
-			(MAIL_STORAGE_FLAG_MMAP_DISABLE |
-			 MAIL_STORAGE_FLAG_MMAP_NO_WRITE)) != 0;
+	if ((storage->flags & (MAIL_STORAGE_FLAG_MMAP_DISABLE |
+			       MAIL_STORAGE_FLAG_MMAP_NO_WRITE)) != 0)
+		flags |= SQUAT_INDEX_FLAG_MMAP_DISABLE;
+	if ((storage->flags & MAIL_STORAGE_FLAG_NFS_FLUSH_INDEX) != 0)
+		flags |= SQUAT_INDEX_FLAG_NFS_FLUSH;
+	if ((storage->flags & MAIL_STORAGE_FLAG_DOTLOCK_USE_EXCL) != 0)
+		flags |= SQUAT_INDEX_FLAG_DOTLOCK_USE_EXCL;
 
 	backend = i_new(struct squat_fts_backend, 1);
 	backend->backend = fts_backend_squat;
 	backend->trie =
 		squat_trie_init(t_strconcat(path, "/"SQUAT_FILE_PREFIX, NULL),
 				status.uidvalidity, storage->lock_method,
-				mmap_disable);
+				flags);
 	return &backend->backend;
 }
 


More information about the dovecot-cvs mailing list