From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 20 Nov 2017 12:28:40 +0000 (+0200)
Subject: lib-storage: mailbox_rename() - Improve debug logging when namespaces are incompatible
X-Git-Tag: 2.3.0.rc1~428
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da613017f6000a562a3217496c12d101dca4c748;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: mailbox_rename() - Improve debug logging when namespaces are incompatible
---

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 4faf4e8c8a..7625fc7d0c 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -1672,15 +1672,18 @@ mailbox_lists_rename_compatible(struct mailbox_list *list1,
 				const char **error_r)
 {
 	if (!nullequals(list1->set.alt_dir, list2->set.alt_dir)) {
-		*error_r = "one namespace has alt dir and another doesn't";
+		*error_r = t_strdup_printf("Namespace %s has alt dir, %s doesn't",
+					   list1->ns->prefix, list2->ns->prefix);
 		return FALSE;
 	}
 	if (!nullequals(list1->set.index_dir, list2->set.index_dir)) {
-		*error_r = "one namespace has index dir and another doesn't";
+		*error_r = t_strdup_printf("Namespace %s has index dir, %s doesn't",
+					   list1->ns->prefix, list2->ns->prefix);
 		return FALSE;
 	}
 	if (!nullequals(list1->set.control_dir, list2->set.control_dir)) {
-		*error_r = "one namespace has control dir and another doesn't";
+		*error_r = t_strdup_printf("Namespace %s has control dir, %s doesn't",
+					   list1->ns->prefix, list2->ns->prefix);
 		return FALSE;
 	}
 	return TRUE;