dovecot-2.2: lib-index: Fixed mail_cache_register_fields() decis...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/f8b99f6d993c
changeset: 16357:f8b99f6d993c
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 15 13:34:59 2013 +0300
description:
lib-index: Fixed mail_cache_register_fields() decision updates.
Normally this shouldn't matter, except when mail_*cache_fields settings have
been used.

diffstat:

 src/lib-index/mail-cache-fields.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r 9275238a88bb -r f8b99f6d993c src/lib-index/mail-cache-fields.c
--- a/src/lib-index/mail-cache-fields.c	Wed May 15 13:20:43 2013 +0300
+++ b/src/lib-index/mail-cache-fields.c	Wed May 15 13:34:59 2013 +0300
@@ -74,8 +74,8 @@
 	i_assert(newfield->type < MAIL_CACHE_FIELD_COUNT);
 
 	orig = &cache->fields[newfield->idx];
-	if (newfield->decision != MAIL_CACHE_DECISION_NO &&
-	    orig->field.decision != newfield->decision) {
+	if ((newfield->decision & MAIL_CACHE_DECISION_FORCED) != 0 ||
+	    newfield->decision > orig->field.decision) {
 		orig->field.decision = newfield->decision;
 		orig->decision_dirty = TRUE;
 	}