From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sun, 17 Dec 2023 13:08:47 +0000 (+0200)
Subject: doveadm auth: Print mail_storage_service_lookup_next() error messages
X-Git-Tag: 2.4.1~1205
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=656be9fad847cefea66e61e98570ebd55d52f306;p=thirdparty%2Fdovecot%2Fcore.git

doveadm auth: Print mail_storage_service_lookup_next() error messages

Previously the commands could have just silently failed.
---

diff --git a/src/doveadm/doveadm-auth-server.c b/src/doveadm/doveadm-auth-server.c
index fe3c42ca87..b673994b57 100644
--- a/src/doveadm/doveadm-auth-server.c
+++ b/src/doveadm/doveadm-auth-server.c
@@ -278,8 +278,11 @@ cmd_user_mail_input(struct mail_storage_service_ctx *storage_service,
 
 	if ((ret = mail_storage_service_lookup_next(storage_service, &service_input,
 						    &user, &error)) <= 0) {
-		if (ret < 0)
+		if (ret < 0) {
+			json_ostream_nwritef_string(json_output, "error",
+				"userdb lookup: %s", error);
 			return -1;
+		}
 		json_ostream_nwritef_string(json_output, "error",
 			"userdb lookup: user %s doesn't exist",
 			input->username);
diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c
index ab3c98b751..a5a5a217de 100644
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -709,8 +709,10 @@ cmd_user_mail_input(struct mail_storage_service_ctx *storage_service,
 
 	if ((ret = mail_storage_service_lookup_next(storage_service, &service_input,
 						    &user, &error)) <= 0) {
-		if (ret < 0)
+		if (ret < 0) {
+			fprintf(stderr, "\nuserdb lookup: %s\n", error);
 			return -1;
+		}
 		fprintf(show_field == NULL && expand_field == NULL ? stdout : stderr,
 			"\nuserdb lookup: user %s doesn't exist\n",
 			input->username);