doveadm-mail-crypt: Do not return prematurely in key generate

Broken by 446d7d9ddfe122e152b832c13fc28d164ae2c5e9

diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c
index 4cbb7757921eba838daa2f681554adcd629bd390..b42c7efa81b6b163a3a68ce6a0f1004119291411 100644 (file)
--- a/src/plugins/mail-crypt/doveadm-mail-crypt.c
+++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c
@@ -260,12 +260,13 @@ static int mcp_keypair_generate(struct mcp_cmd_context *ctx,
                                        key_id, &error)) {
                        i_error("dcrypt_key_id_public() failed: %s",
                                error);
-                       return -1;
+                       ret = -1;
+               } else {
+                       *pubid_r = p_strdup(ctx->ctx.pool, binary_to_hex(key_id->data,
+                                                                        key_id->used));
+                       *pair_r = pair;
+                       ret = 1;
                }
-               *pubid_r = p_strdup(ctx->ctx.pool, binary_to_hex(key_id->data,
-                                                                key_id->used));
-               *pair_r = pair;
-               return 1;
        } else if (ret == 1 && ctx->recrypt_box_keys) {
                /* do nothing, because force isn't being used *OR*
                   we are recrypting box keys and force refers to