From: Timo Sirainen <tss@iki.fi>
Date: Sun, 6 Dec 2015 16:08:20 +0000 (+0200)
Subject: lib-storage: mail_search_args_equal() ignored some differences.
X-Git-Tag: 2.2.20~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=914e08a6f3131dd4b304d1e3b8e399bfc3b96e21;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mail_search_args_equal() ignored some differences.
 - fuzzy flag
 - MAIL_SEARCH_ARG_FLAG_USE_TZ
 - INTHREAD thread type
---

diff --git a/src/lib-storage/mail-search.c b/src/lib-storage/mail-search.c
index af26df032f..34cbb3295f 100644
--- a/src/lib-storage/mail-search.c
+++ b/src/lib-storage/mail-search.c
@@ -587,7 +587,9 @@ static bool mail_search_arg_one_equals(const struct mail_search_arg *arg1,
 				       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 @@ static bool mail_search_arg_one_equals(const struct mail_search_arg *arg1,
 			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);
 	}