From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 5 Oct 2017 12:40:45 +0000 (+0300)
Subject: mail-crypt: Fix key generation handling
X-Git-Tag: 2.3.0.rc1~894
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d2c599b0d4994570aef37030fbf9d8c58377934;p=thirdparty%2Fdovecot%2Fcore.git

mail-crypt: Fix key generation handling

Userkey generation would not set all required fields.
---

diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c
index 99b99e7856..cafe5952d9 100644
--- a/src/plugins/mail-crypt/doveadm-mail-crypt.c
+++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c
@@ -322,9 +322,11 @@ static int mcp_keypair_generate_run(struct doveadm_mail_cmd_context *_ctx,
 		if (mail_crypt_user_generate_keypair(user, &pair, &pubid,
 						     &error) < 0) {
 			res->success = FALSE;
-			res->id = p_strdup(_ctx->pool, error);
+			res->error = p_strdup(_ctx->pool, error);
 			return -1;
 		}
+		res->success = TRUE;
+		res->id = p_strdup(_ctx->pool, pubid);
 		user_key = pair.pub;
 		dcrypt_key_unref_private(&pair.priv);
 	}
@@ -412,6 +414,7 @@ static int cmd_mcp_keypair_generate_run(struct doveadm_mail_cmd_context *_ctx,
 		if (res->success)
 			doveadm_print("\xE2\x9C\x93");
 		else {
+			_ctx->exit_code = EX_DATAERR;
 			ret = -1;
 			doveadm_print("x");
 		}