Mercurial > dovecot > core-2.2
changeset 22935:dc05b2f6a4dd
doveadm: mailbox cache decisions - Fatally fail if fields are missing
| author | Aki Tuomi <aki.tuomi@dovecot.fi> |
|---|---|
| date | Wed, 25 Apr 2018 11:04:08 +0300 |
| parents | 7a52d7471f90 |
| children | 2cc04e280ced |
| files | src/doveadm/doveadm-mail-mailbox-cache.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail-mailbox-cache.c Wed Apr 25 10:56:04 2018 +0300 +++ b/src/doveadm/doveadm-mail-mailbox-cache.c Wed Apr 25 11:04:08 2018 +0300 @@ -57,11 +57,8 @@ 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 @@ 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)