]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
mail-crypt: Commit transaction before lookup in test
authorAki Tuomi <aki.tuomi@dovecot.fi>
Mon, 28 Nov 2016 10:16:26 +0000 (12:16 +0200)
committerAki Tuomi <aki.tuomi@dovecot.fi>
Mon, 28 Nov 2016 10:16:26 +0000 (12:16 +0200)
Key cannot be found if it's not committed before.

src/plugins/mail-crypt/test-mail-key.c

index 66f483d8f33843a16db8bed1c0ccde193aeaeb60..67c517c3aa2bb74c37a6beab1a67b84fbb917165 100644 (file)
@@ -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 */