From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 13 Apr 2017 09:51:25 +0000 (+0300)
Subject: lib-storage: mail_search_args_to_cmdline() - Fix writing FLAGS & KEYWORDS
X-Git-Tag: 2.3.0.rc1~1728
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b6ebd5497ef2764d8886144d2aa0e1e6c43a4ab;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mail_search_args_to_cmdline() - Fix writing FLAGS & KEYWORDS
---

diff --git a/src/lib-storage/mail-search-args-cmdline.c b/src/lib-storage/mail-search-args-cmdline.c
index 8b80428260..003b1dec57 100644
--- a/src/lib-storage/mail-search-args-cmdline.c
+++ b/src/lib-storage/mail-search-args-cmdline.c
@@ -42,10 +42,12 @@ mail_search_arg_to_cmdline(string_t *dest, const struct mail_search_arg *arg)
 	case SEARCH_KEYWORDS: {
 		size_t pos = str_len(dest);
 
-		if (!mail_search_arg_to_imap(dest, arg, &error))
+		new_arg = *arg;
+		new_arg.match_not = FALSE;
+		if (!mail_search_arg_to_imap(dest, &new_arg, &error))
 			i_unreached();
 		str_insert(dest, pos+1, " ");
-		str_insert(dest, str_len(dest)-2, " ");
+		str_insert(dest, str_len(dest)-1, " ");
 		return;
 	}
 	case SEARCH_INTHREAD: