From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 19 Feb 2016 12:08:40 +0000 (+0200)
Subject: doveadm: If user lookup fails, log an error but don't kill the process.
X-Git-Tag: 2.2.22.rc1~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=374fed59cd85a2e1a42a86e20d9c8d3b2a12a604;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: If user lookup fails, log an error but don't kill the process.
---

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 66e8ee0c8a..4b98e876c7 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -562,10 +562,14 @@ doveadm_mail_cmd_exec(struct doveadm_mail_cmd_context *ctx,
 		input.service = "doveadm";
 		input.username = ctx->cur_username;
 		ret = doveadm_mail_single_user(ctx, &input, &error);
-		if (ret < 0)
-			i_fatal("%s", error);
-		else if (ret == 0)
-			i_fatal_status(EX_NOUSER, "User doesn't exist");
+		if (ret < 0) {
+			/* user lookup/init failed somehow */
+			doveadm_exit_code = EX_TEMPFAIL;
+			i_error("%s", error);
+		} else if (ret == 0) {
+			doveadm_exit_code = EX_NOUSER;
+			i_error("User doesn't exist");
+		}
 	} else {
 		ctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP;
 		doveadm_mail_all_users(ctx, wildcard_user);