dovecot-2.2: imap: Dynamic capabilities weren't being added corr...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/2ef1371e0b77
changeset: 18208:2ef1371e0b77
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jan 30 12:19:58 2015 +0200
description:
imap: Dynamic capabilities weren't being added correctly when imap_capability setting was used.
They were supposed to be added when '+' prefix was used in imap_capability
and not added when it wasn't. But the behavior was exactly the opposite.

diffstat:

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

diffs (17 lines):

diff -r 081c7da83d8f -r 2ef1371e0b77 src/imap/imap-client.c
--- a/src/imap/imap-client.c	Fri Jan 30 11:53:12 2015 +0200
+++ b/src/imap/imap-client.c	Fri Jan 30 12:19:58 2015 +0200
@@ -108,10 +108,10 @@
 
 	if (*set->imap_capability == '\0')
 		str_append(client->capability_string, CAPABILITY_STRING);
-	else if (*set->imap_capability != '+')
+	else if (*set->imap_capability != '+') {
+		explicit_capability = TRUE;
 		str_append(client->capability_string, set->imap_capability);
-	else {
-		explicit_capability = TRUE;
+	} else {
 		str_append(client->capability_string, CAPABILITY_STRING);
 		str_append_c(client->capability_string, ' ');
 		str_append(client->capability_string, set->imap_capability + 1);