From 573f68ee0725daebb5aaec0842cfff32da57de5b Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 8 Aug 2016 13:21:34 +0300 Subject: [PATCH] doveadm: Pass connection to mail context --- src/doveadm/client-connection.c | 1 + src/doveadm/doveadm-cmd.h | 1 + src/doveadm/doveadm-mail.c | 1 + 3 files changed, 3 insertions(+) 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); -- 2.47.3