From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 22 Jan 2018 22:04:28 +0000 (+0200)
Subject: lib-index: Fix removal of forced cache decisions from existing cache files
X-Git-Tag: 2.3.1~391
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e06000a1f29261508952c88c7a515ff59d5f0c2;p=thirdparty%2Fdovecot%2Fcore.git

lib-index: Fix removal of forced cache decisions from existing cache files

The forced-flags are written to the cache file when the file is created.
They were also read back, and the force-flag was preserved even when the
configuration was removed.
---

diff --git a/src/lib-index/mail-cache-fields.c b/src/lib-index/mail-cache-fields.c
index 326131e880..64c3dd761c 100644
--- a/src/lib-index/mail-cache-fields.c
+++ b/src/lib-index/mail-cache-fields.c
@@ -411,7 +411,7 @@ int mail_cache_header_fields_read(struct mail_cache *cache)
 			field.name = names;
 			field.type = types[i];
 			field.field_size = sizes[i];
-			field.decision = decisions[i];
+			field.decision = decisions[i] & ~MAIL_CACHE_DECISION_FORCED;
 			mail_cache_register_fields(cache, &field, 1);
 			fidx = field.idx;
 		}