dovecot-2.2: lib-storage: mail_search_args_equal() ignored some ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/95d355376204
changeset: 19470:95d355376204
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Dec 06 18:08:20 2015 +0200
description:
lib-storage: mail_search_args_equal() ignored some differences.
 - fuzzy flag
 - MAIL_SEARCH_ARG_FLAG_USE_TZ
 - INTHREAD thread type

diffstat:

 src/lib-storage/mail-search.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 59a8b0aa6379 -r 95d355376204 src/lib-storage/mail-search.c
--- a/src/lib-storage/mail-search.c	Sun Dec 06 18:06:45 2015 +0200
+++ b/src/lib-storage/mail-search.c	Sun Dec 06 18:08:20 2015 +0200
@@ -587,7 +587,9 @@
 				       const struct mail_search_arg *arg2)
 {
 	if (arg1->type != arg2->type ||
-	    arg1->match_not != arg2->match_not)
+	    arg1->match_not != arg2->match_not ||
+	    arg1->fuzzy != arg2->fuzzy ||
+	    arg1->value.search_flags != arg2->value.search_flags)
 		return FALSE;
 
 	switch (arg1->type) {
@@ -648,6 +650,8 @@
 			m1->type == m2->type;
 	}
 	case SEARCH_INTHREAD:
+		if (arg1->value.thread_type != arg2->value.thread_type)
+			return FALSE;
 		return mail_search_args_equal(arg1->initialized.search_args,
 					      arg2->initialized.search_args);
 	}