From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 8 Aug 2016 10:21:34 +0000 (+0300)
Subject: doveadm: Pass connection to mail context
X-Git-Tag: 2.2.26~399
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=573f68ee0725daebb5aaec0842cfff32da57de5b;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Pass connection to mail context
---

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index 1c3398cff1..72a20c44e9 100644
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -297,6 +297,7 @@ static bool client_handle_command(struct client_connection *conn, char **args)
 	cctx.remote_ip = conn->remote_ip;
 	cctx.local_port = conn->local_port;
 	cctx.remote_port = conn->remote_port;
+	cctx.conn = conn;
 
 	flags = args[0];
 	cctx.username = args[1];
diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index 19a46cdedf..e599d16abb 100644
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -79,6 +79,7 @@ struct doveadm_cmd_context {
 	bool cli;
 	struct ip_addr local_ip, remote_ip;
 	in_port_t local_port, remote_port;
+	struct client_connection *conn;
 };
 
 ARRAY_DEFINE_TYPE(doveadm_cmd, struct doveadm_cmd);
diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index ca89a94c8c..1c6c396ef9 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -1037,6 +1037,7 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx)
 	mctx->args = array_idx(&full_args, args_pos);
 	mctx->full_args = array_idx(&full_args, 0);
 	mctx->cli = cctx->cli;
+	mctx->conn = cctx->conn;
 
 	doveadm_mail_cmd_exec(mctx, cctx, wildcard_user);
 	doveadm_mail_cmd_free(mctx);