From: Timo Sirainen Date: Wed, 6 Nov 2019 17:27:07 +0000 (+0200) Subject: imap: Fix args and human_args parameters to imap_command_finished event X-Git-Tag: 2.3.10~316 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10bddad971471a832cf5cd28c419c2fd11bb4d90;p=thirdparty%2Fdovecot%2Fcore.git imap: Fix args and human_args parameters to imap_command_finished event They were being set too early when they didn't yet exist. --- diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c index 0b7d2d3cda..344eb25222 100644 --- a/src/imap/imap-client.c +++ b/src/imap/imap-client.c @@ -731,10 +731,12 @@ bool client_read_args(struct client_command_context *cmd, unsigned int count, str = t_str_new(256); imap_write_args(str, *args_r); cmd->args = p_strdup(cmd->pool, str_c(str)); + event_add_str(cmd->event, "args", cmd->args); str_truncate(str, 0); imap_write_args_for_human(str, *args_r); cmd->human_args = p_strdup(cmd->pool, str_c(str)); + event_add_str(cmd->event, "human_args", cmd->human_args); cmd->client->input_lock = NULL; return TRUE; @@ -895,10 +897,6 @@ void client_command_init_finished(struct client_command_context *cmd) { event_add_str(cmd->event, "tag", cmd->tag); event_add_str(cmd->event, "name", t_str_ucase(cmd->name)); - if (cmd->args != NULL) - event_add_str(cmd->event, "args", cmd->args); - if (cmd->human_args != NULL) - event_add_str(cmd->event, "human_args", cmd->human_args); } static struct client_command_context *