dovecot-2.1: fts-squat: Fixed search to actually work.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/ee6f3f375dd3
changeset: 14209:ee6f3f375dd3
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Feb 29 12:53:21 2012 +0200
description:
fts-squat: Fixed search to actually work.

diffstat:

 src/plugins/fts-squat/fts-backend-squat.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r bdc881838b00 -r ee6f3f375dd3 src/plugins/fts-squat/fts-backend-squat.c
--- a/src/plugins/fts-squat/fts-backend-squat.c	Tue Feb 28 18:50:46 2012 +0200
+++ b/src/plugins/fts-squat/fts-backend-squat.c	Wed Feb 29 12:53:21 2012 +0200
@@ -436,6 +436,7 @@
 {
 	struct squat_fts_backend *backend =
 		(struct squat_fts_backend *)_backend;
+	bool first = TRUE;
 	int ret;
 
 	fts_backend_squat_set_box(backend, box);
@@ -446,14 +447,14 @@
 	}
 
 	for (; args != NULL; args = args->next) {
-		ret = squat_lookup_arg(backend, args, and_args,
+		ret = squat_lookup_arg(backend, args, first ? FALSE : and_args,
 				       &result->definite_uids,
 				       &result->maybe_uids);
 		if (ret < 0)
 			return -1;
 		if (ret > 0)
 			args->match_always = TRUE;
-
+		first = FALSE;
 	}
 	return 0;
 }