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 fe3c42ca873691dad99c736d85c243fea9b73b95..b673994b57111604a91c66ae51972dcb75df0423 100644 (file)
--- 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 ab3c98b751dbde08c560961acdfe55732a0b2115..a5a5a217dec2e8f9d53a558ee4b575fe4beda4ce 100644 (file)
--- 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);