From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 25 Apr 2018 08:04:08 +0000 (+0300)
Subject: doveadm: mailbox cache decisions - Fatally fail if fields are missing
X-Git-Tag: 2.2.36.rc1~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9cab28092580794cba81600d79d13a6ca95bacb;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: mailbox cache decisions - Fatally fail if fields are missing
---

diff --git a/src/doveadm/doveadm-mail-mailbox-cache.c b/src/doveadm/doveadm-mail-mailbox-cache.c
index b109966dd2..090d2543f8 100644
--- a/src/doveadm/doveadm-mail-mailbox-cache.c
+++ b/src/doveadm/doveadm-mail-mailbox-cache.c
@@ -57,11 +57,8 @@ static void cmd_mailbox_cache_decision_init(struct doveadm_mail_cmd_context *_ct
 	doveadm_print_header_simple("decision");
 	doveadm_print_header_simple("last-used");
 
-	if (!ctx->all_fields && ctx->fields == NULL) {
-		i_error("Missing fields parameter");
-		_ctx->exit_code = EX_USAGE;
-		return;
-	}
+	if (!ctx->all_fields && ctx->fields == NULL)
+		i_fatal("Missing fields parameter");
 
 	ctx->boxes = args;
 }
@@ -224,6 +221,9 @@ static int cmd_mailbox_cache_decision_run(struct doveadm_mail_cmd_context *_ctx,
 	const char *const *boxname;
 	int ret = 0;
 
+	if (_ctx->exit_code != 0)
+		return -1;
+
 	for(boxname = ctx->boxes; ret == 0 && *boxname != NULL; boxname++) {
 		struct mailbox *box;
 		if ((ret = cmd_mailbox_cache_open_box(_ctx, user, *boxname, &box)) < 0)