expire plugin: Fixes for using namespace prefixes.

--HG--
branch : HEAD

diff --git a/src/plugins/expire/expire-plugin.c b/src/plugins/expire/expire-plugin.c
index 3610c29f909ddba01ce7d39972a1764d8db52158..0aa603da81b8f2d2136efb99f990caf8659632d6 100644 (file)
--- a/src/plugins/expire/expire-plugin.c
+++ b/src/plugins/expire/expire-plugin.c
@@ -99,7 +99,6 @@ expire_mailbox_transaction_commit(struct mailbox_transaction_context *t,
 {
        struct expire_mailbox *xpr_box = EXPIRE_CONTEXT(t->box);
        struct expire_transaction_context *xt = EXPIRE_CONTEXT(t);
-       const char *mailbox_name = t->box->name;
        time_t new_stamp;
        bool update_dict = FALSE;
        int ret;
@@ -123,7 +122,8 @@ expire_mailbox_transaction_commit(struct mailbox_transaction_context *t,
                const char *key, *value;
 
                key = t_strconcat(DICT_EXPIRE_PREFIX, expire.username, "/",
-                                 mailbox_name, NULL);
+                                 t->box->storage->ns->prefix,
+                                 t->box->name, NULL);
                if (!xt->first_expunged && xt->saves) {
                        /* saved new mails. dict needs to be updated only if
                           this is the first mail in the database */

diff --git a/src/plugins/expire/expire-tool.c b/src/plugins/expire/expire-tool.c
index 02e99d5d39889a5420ebf5339cd5cff02214dfe6..994ddcb53c03d1fe12e35683e44775a4d1608518 100644 (file)
--- a/src/plugins/expire/expire-tool.c
+++ b/src/plugins/expire/expire-tool.c
@@ -100,7 +100,7 @@ mailbox_delete_old_mails(struct expire_context *ctx, const char *user,
                errstr = mail_storage_get_last_error(ns->storage, &error);
                if (error != MAIL_ERROR_NOTFOUND) {
                        i_error("%s: Opening mailbox %s failed: %s",
-                               user, ns_mailbox, errstr);
+                               user, mailbox, errstr);
                        return -1;
                }