Mercurial > dovecot > core-2.2

changeset 22600:be272aa6e878

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doveadm-mail-crypt: Do not return prematurely in key generate Broken by 446d7d9ddfe122e152b832c13fc28d164ae2c5e9
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Tue, 10 Oct 2017 12:52:15 +0300
parents 569e7f438b90
children 09164094f254
files src/plugins/mail-crypt/doveadm-mail-crypt.c
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/mail-crypt/doveadm-mail-crypt.c	Fri Oct 06 09:02:49 2017 +0300
+++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c	Tue Oct 10 12:52:15 2017 +0300
@@ -260,12 +260,13 @@
 					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