From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 4 Jan 2016 19:23:46 +0000 (-0500)
Subject: lib-storage: Fixed autoexpunge for namespaces with non-empty prefix
X-Git-Tag: 2.2.22.rc1~383
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76e5f0fe5e9e8bdee24d0e047378a665e01b808d;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Fixed autoexpunge for namespaces with non-empty prefix
---

diff --git a/src/lib-storage/mail-autoexpunge.c b/src/lib-storage/mail-autoexpunge.c
index 9c1937d0b9..f61d8378f3 100644
--- a/src/lib-storage/mail-autoexpunge.c
+++ b/src/lib-storage/mail-autoexpunge.c
@@ -63,6 +63,7 @@ static void mail_namespace_autoexpunge(struct mail_namespace *ns)
 	struct mailbox_settings *const *box_set;
 	struct mailbox *box;
 	time_t expire_time;
+	const char *vname;
 
 	if (!array_is_created(&ns->set->mailboxes))
 		return;
@@ -71,8 +72,10 @@ static void mail_namespace_autoexpunge(struct mail_namespace *ns)
 		if ((*box_set)->autoexpunge == 0 ||
 		    (unsigned int)ioloop_time < (*box_set)->autoexpunge)
 			continue;
+
+		vname = t_strconcat(ns->prefix, (*box_set)->name, NULL);
 		expire_time = ioloop_time - (*box_set)->autoexpunge;
-		box = mailbox_alloc(ns->list, (*box_set)->name, 0);
+		box = mailbox_alloc(ns->list, vname, 0);
 		if (mailbox_autoexpunge(box, expire_time) < 0) {
 			i_error("Failed to autoexpunge mailbox '%s': %s",
 				mailbox_get_vname(box),