From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 12 Dec 2016 07:41:02 +0000 (+0200)
Subject: doveadm-mail: Set exit code to EX_TEMPFAIL on timeout
X-Git-Tag: 2.3.0.rc1~2438
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0e6a65a4b3971c6e00c97c8be19222165899cb7;p=thirdparty%2Fdovecot%2Fcore.git

doveadm-mail: Set exit code to EX_TEMPFAIL on timeout

When running `doveadm save` command on proxy/director
and the remote command execution times out, exit code
must be set to EX_TEMPFAIL.

Fixes Panic: file doveadm-mail.c: line 405 (doveadm_mail_next_user):
assertion failed: (ctx->exit_code != 0)
---

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index efbc4d1308..dbf3a330f4 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -188,6 +188,7 @@ static void doveadm_mail_cmd_input_timeout(struct doveadm_mail_cmd_context *ctx)
 	i_stream_set_name(input, i_stream_get_name(ctx->cmd_input));
 	i_stream_destroy(&ctx->cmd_input);
 	ctx->cmd_input = input;
+	ctx->exit_code = EX_TEMPFAIL;
 	io_loop_stop(current_ioloop);
 }