dovecot-2.2: imap: If imap_capability setting is set explicitly,...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/722dba791812
changeset: 14895:722dba791812
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Aug 13 15:09:30 2012 +0300
description:
imap: If imap_capability setting is set explicitly, don't automatically add SEARCH=FUZZY.

diffstat:

 src/imap/imap-client.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 4d6ea3b30235 -r 722dba791812 src/imap/imap-client.c
--- a/src/imap/imap-client.c	Mon Aug 13 15:03:46 2012 +0300
+++ b/src/imap/imap-client.c	Mon Aug 13 15:09:30 2012 +0300
@@ -42,6 +42,7 @@
 	struct client *client;
 	const char *ident;
 	pool_t pool;
+	bool explicit_capability = FALSE;
 
 	/* always use nonblocking I/O */
 	net_set_nonblock(fd_in, TRUE);
@@ -84,11 +85,12 @@
 	else if (*set->imap_capability != '+')
 		str_append(client->capability_string, set->imap_capability);
 	else {
+		explicit_capability = TRUE;
 		str_append(client->capability_string, CAPABILITY_STRING);
 		str_append_c(client->capability_string, ' ');
 		str_append(client->capability_string, set->imap_capability + 1);
 	}
-	if (user->fuzzy_search) {
+	if (user->fuzzy_search && !explicit_capability) {
 		/* Enable FUZZY capability only when it actually has
 		   a chance of working */
 		str_append(client->capability_string, " SEARCH=FUZZY");