From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 7 Nov 2019 12:29:07 +0000 (+0200)
Subject: imap: APPEND - Fix parameters for cmd_args and cmd_human_args
X-Git-Tag: 2.3.9~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=837ad036d9cc26543249283f8c71237f6ee116ea;p=thirdparty%2Fdovecot%2Fcore.git

imap: APPEND - Fix parameters for cmd_args and cmd_human_args

Note that this still includes only the first parameters when CATENATE or
MULTIAPPEND is used.
---

diff --git a/src/imap/cmd-append.c b/src/imap/cmd-append.c
index f04d49946b..920fe187e1 100644
--- a/src/imap/cmd-append.c
+++ b/src/imap/cmd-append.c
@@ -44,6 +44,7 @@ struct cmd_append_context {
 	bool message_input:1;
 	bool binary_input:1;
 	bool catenate:1;
+	bool cmd_args_set:1;
 	bool failed:1;
 };
 
@@ -481,6 +482,11 @@ cmd_append_handle_args(struct client_command_context *cmd,
 	int ret, timezone_offset;
 	bool valid;
 
+	if (!ctx->cmd_args_set) {
+		ctx->cmd_args_set = TRUE;
+		client_args_finished(cmd, args);
+	}
+
 	/* [<flags>] */
 	if (!imap_arg_get_list(args, &flags_list))
 		flags_list = NULL;