Mercurial > dovecot > core-2.2
changeset 20821:eac0ad9c3a6c
lib-storage: autoexpunge mailboxes with wildcards didn't work with namespace prefix.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Tue, 04 Oct 2016 17:31:26 +0300 |
| parents | 0901db0db1c4 |
| children | 57f16b05f3b2 |
| files | src/lib-storage/mail-autoexpunge.c |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/mail-autoexpunge.c Tue Sep 27 19:48:14 2016 +0300 +++ b/src/lib-storage/mail-autoexpunge.c Tue Oct 04 17:31:26 2016 +0300 @@ -107,8 +107,10 @@ { struct mailbox_list_iterate_context *iter; const struct mailbox_info *info; + const char *iter_name; - iter = mailbox_list_iter_init(ns->list, set->name, + iter_name = t_strconcat(ns->prefix, set->name, NULL); + iter = mailbox_list_iter_init(ns->list, iter_name, MAILBOX_LIST_ITER_NO_AUTO_BOXES | MAILBOX_LIST_ITER_SKIP_ALIASES | MAILBOX_LIST_ITER_RETURN_NO_FLAGS); @@ -117,9 +119,8 @@ set->autoexpunge_max_mails); } T_END; if (mailbox_list_iter_deinit(&iter) < 0) { - i_error("Failed to iterate autoexpunge mailboxes '%s%s': %s", - ns->prefix, set->name, - mailbox_list_get_last_error(ns->list, NULL)); + i_error("Failed to iterate autoexpunge mailboxes '%s': %s", + iter_name, mailbox_list_get_last_error(ns->list, NULL)); } }