From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 4 Apr 2017 12:58:42 +0000 (+0300)
Subject: imap: Add client_command_context.human_args
X-Git-Tag: 2.2.29.rc1~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f09a1b010ebdd81d38e790af0a64539667b970bb;p=thirdparty%2Fdovecot%2Fcore.git

imap: Add client_command_context.human_args

Generated with imap_write_args_for_human()
---

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 1e19e3e1d8..c9e890351c 100644
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -663,6 +663,10 @@ bool client_read_args(struct client_command_context *cmd, unsigned int count,
 		imap_write_args(str, *args_r);
 		cmd->args = p_strdup(cmd->pool, str_c(str));
 
+		str_truncate(str, 0);
+		imap_write_args_for_human(str, *args_r);
+		cmd->human_args = p_strdup(cmd->pool, str_c(str));
+
 		cmd->client->input_lock = NULL;
 		return TRUE;
 	} else if (ret == -2) {
diff --git a/src/imap/imap-client.h b/src/imap/imap-client.h
index c71eb84d95..e97998f7c0 100644
--- a/src/imap/imap-client.h
+++ b/src/imap/imap-client.h
@@ -88,6 +88,9 @@ struct client_command_context {
 	   arguments, so they may not be exactly the same as how client sent
 	   them. */
 	const char *args;
+	/* Parameters for this command generated with
+	   imap_write_args_for_human(), so it's suitable for logging. */
+	const char *human_args;
 	enum command_flags cmd_flags;
 	const char *tagline_reply;