lib-index: Fix adding forced cache decisions to existing cache files

If a field already existed in the cache file, the cache decision from the
file was always used. This caused force-decisions to be ignored.

diff --git a/src/lib-index/mail-cache-fields.c b/src/lib-index/mail-cache-fields.c
index fcd81c2ab61ac6794dfc0cf7bb9bb074c8631b73..326131e88006cdb662754db6d1e9a5fba3e59ee8 100644 (file)
--- a/src/lib-index/mail-cache-fields.c
+++ b/src/lib-index/mail-cache-fields.c
@@ -398,7 +398,9 @@ int mail_cache_header_fields_read(struct mail_cache *cache)
                                           &orig_key, &orig_value)) {
                        /* already exists, see if decision can be updated */
                        fidx = POINTER_CAST_TO(orig_value, unsigned int);
-                       if (!cache->fields[fidx].decision_dirty) {
+                       if (!cache->fields[fidx].decision_dirty &&
+                           (cache->fields[fidx].field.decision &
+                            MAIL_CACHE_DECISION_FORCED) == 0) {
                                cache->fields[fidx].field.decision =
                                        decisions[i];
                        }