mail-crypt: Fix key generation handling

Userkey generation would not set all required fields.
dovecot · Oct 10, 2017 · 424deab · 424deab
1 parent d5488dc
commit 424deab
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c
@@ -329,9 +329,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);
 	}
@@ -419,6 +421,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");
 		}