From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 28 Nov 2016 10:16:26 +0000 (+0200)
Subject: mail-crypt: Commit transaction before lookup in test
X-Git-Tag: 2.2.27~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb7cdf736cbf9f918048be919058ccdbdd586e29;p=thirdparty%2Fdovecot%2Fcore.git

mail-crypt: Commit transaction before lookup in test

Key cannot be found if it's not committed before.
---

diff --git a/src/plugins/mail-crypt/test-mail-key.c b/src/plugins/mail-crypt/test-mail-key.c
index 66f483d8f3..67c517c3aa 100644
--- a/src/plugins/mail-crypt/test-mail-key.c
+++ b/src/plugins/mail-crypt/test-mail-key.c
@@ -119,13 +119,12 @@ test_mail_attribute_set(struct mailbox_transaction_context *t,
 	attr_value.value = value;
 
 	if ((ret = mailbox_attribute_set(t, attr_type,
-					 attr_name, &attr_value)) <= 0) {
-		if (ret < 0) {
-			*error_r = t_strdup_printf("mailbox_attribute_set(%s, %s) failed: %s",
-						   mailbox_get_vname(mailbox_transaction_get_mailbox(t)),
-						   attr_name,
-						   mailbox_get_last_error(mailbox_transaction_get_mailbox(t), NULL));
-		}
+					 attr_name, &attr_value)) < 0) {
+		*error_r = t_strdup_printf("mailbox_attribute_set(%s, %s) failed: %s",
+					   mailbox_get_vname(mailbox_transaction_get_mailbox(t)),
+					   attr_name,
+					   mailbox_get_last_error(mailbox_transaction_get_mailbox(t), NULL));
+
 	}
 
 	return ret;
@@ -413,6 +412,10 @@ static void test_old_key(void)
 	test_mail_attribute_set(t, FALSE, FALSE, mcp_old_box_key_id,
 				mcp_old_box_key, &error);
 
+	(void)mailbox_transaction_commit(&t);
+
+	t = mailbox_transaction_begin(box, 0);
+
 	error = NULL;
 
 	/* try to load old key */