From: Timo Sirainen <tss@iki.fi>
Date: Thu, 17 Feb 2011 06:29:47 +0000 (+0200)
Subject: lib-storage: Fixed renaming mailboxes in a non-private namespace.
X-Git-Tag: 2.0.10~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=874766f940cb44291e40f5c138eaf175d524a350;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Fixed renaming mailboxes in a non-private namespace.
---

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 90c2be5959..f8d67b2493 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -844,8 +844,9 @@ int mailbox_rename(struct mailbox *src, struct mailbox *dest,
 			"Can't rename mailboxes across specified storages.");
 		return -1;
 	}
-	if (src->list->ns->type != NAMESPACE_PRIVATE ||
-	    dest->list->ns->type != NAMESPACE_PRIVATE) {
+	if (src->list != dest->list &&
+	    (src->list->ns->type != NAMESPACE_PRIVATE ||
+	     dest->list->ns->type != NAMESPACE_PRIVATE)) {
 		mail_storage_set_error(src->storage, MAIL_ERROR_NOTPOSSIBLE,
 			"Renaming not supported across non-private namespaces.");
 		return -1;