From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Fri, 16 Apr 2021 07:01:45 +0000 (+0300)
Subject: virtual: virtual-mail - Use index_mail_free
X-Git-Tag: 2.3.15~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5098ff2b024fe86f28f56dd1e11a8786ba2695c;p=thirdparty%2Fdovecot%2Fcore.git

virtual: virtual-mail - Use index_mail_free

Since we are using index_mail_init, we need to use index_mail_free
to free up the virtual mail.
---

diff --git a/src/plugins/virtual/virtual-mail.c b/src/plugins/virtual/virtual-mail.c
index 76d773690a..3c5bac383a 100644
--- a/src/plugins/virtual/virtual-mail.c
+++ b/src/plugins/virtual/virtual-mail.c
@@ -74,21 +74,6 @@ static void virtual_mail_close(struct mail *mail)
 	index_mail_close(mail);
 }
 
-static void virtual_mail_free(struct mail *mail)
-{
-	struct virtual_mail *vmail = (struct virtual_mail *)mail;
-	struct mail **mails;
-	unsigned int i, count;
-
-	vmail->imail.freeing = TRUE;
-	virtual_mail_close(mail);
-	mail->transaction->mail_ref_count--;
-
-	event_unref(&mail->event);
-	pool_unref(&vmail->imail.mail.data_pool);
-	pool_unref(&vmail->imail.mail.pool);
-}
-
 static struct mail *
 backend_mail_find(struct virtual_mail *vmail, struct mailbox *box)
 {
@@ -560,7 +545,7 @@ virtual_mail_set_cache_corrupted(struct mail *mail,
 
 struct mail_vfuncs virtual_mail_vfuncs = {
 	virtual_mail_close,
-	virtual_mail_free,
+	index_mail_free,
 	virtual_mail_set_seq,
 	virtual_mail_set_uid,
 	virtual_mail_set_uid_cache_updates,