From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 13 Apr 2017 09:36:30 +0000 (+0300)
Subject: lib-storage: mail_search_args_to_cmdline() - Write MAILBOX glob without X- prefix
X-Git-Tag: 2.2.30.rc1~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec4d9184aade38406ddc9757de5ad53aeebcbbac;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mail_search_args_to_cmdline() - Write MAILBOX glob without X- prefix

Since SEARCH_MAILBOX is written out as "MAILBOX", SEARCH_MAILBOX_GLOB should
also be written as "MAILBOX" rather than "X-MAILBOX".
---

diff --git a/src/lib-storage/mail-search-args-cmdline.c b/src/lib-storage/mail-search-args-cmdline.c
index 8554d84d77..8b80428260 100644
--- a/src/lib-storage/mail-search-args-cmdline.c
+++ b/src/lib-storage/mail-search-args-cmdline.c
@@ -55,6 +55,7 @@ mail_search_arg_to_cmdline(string_t *dest, const struct mail_search_arg *arg)
 		mail_search_subargs_to_cmdline(dest, arg->value.subargs, " ");
 		break;
 	case SEARCH_MAILBOX:
+	case SEARCH_MAILBOX_GLOB:
 		str_append(dest, "MAILBOX ");
 		imap_append_astring(dest, arg->value.str);
 		return;
@@ -77,7 +78,6 @@ mail_search_arg_to_cmdline(string_t *dest, const struct mail_search_arg *arg)
 	case SEARCH_TEXT:
 	case SEARCH_MODSEQ:
 	case SEARCH_GUID:
-	case SEARCH_MAILBOX_GLOB:
 	case SEARCH_REAL_UID:
 	case SEARCH_MIMEPART:
 		break;