dovecot-1.2: expire plugin: Fixes for using namespace prefixes.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/9cabb706d3df
changeset: 8243:9cabb706d3df
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Oct 05 17:21:36 2008 +0300
description:
expire plugin: Fixes for using namespace prefixes.

diffstat:

2 files changed, 3 insertions(+), 3 deletions(-)
src/plugins/expire/expire-plugin.c |    4 ++--
src/plugins/expire/expire-tool.c   |    2 +-

diffs (33 lines):

diff -r 7038df7f5d34 -r 9cabb706d3df src/plugins/expire/expire-plugin.c
--- a/src/plugins/expire/expire-plugin.c	Sun Oct 05 17:12:11 2008 +0300
+++ b/src/plugins/expire/expire-plugin.c	Sun Oct 05 17:21:36 2008 +0300
@@ -99,7 +99,6 @@ expire_mailbox_transaction_commit(struct
 {
 	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
 		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 -r 7038df7f5d34 -r 9cabb706d3df src/plugins/expire/expire-tool.c
--- a/src/plugins/expire/expire-tool.c	Sun Oct 05 17:12:11 2008 +0300
+++ b/src/plugins/expire/expire-tool.c	Sun Oct 05 17:21:36 2008 +0300
@@ -100,7 +100,7 @@ mailbox_delete_old_mails(struct expire_c
 		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;
 		}