From: Timo Sirainen <tss@iki.fi>
Date: Wed, 29 May 2013 00:27:09 +0000 (+0300)
Subject: lib-storage: If INDEX=MEMORY, return index root dir as nonexistent instead of as "".
X-Git-Tag: 2.2.3~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c95939662dc6e4317f4eec60289bb12fd51982b;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: If INDEX=MEMORY, return index root dir as nonexistent instead of as "".
---

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 49a4c46b55..5eedf047d0 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -1271,8 +1271,15 @@ bool mailbox_list_set_get_root_path(const struct mailbox_list_settings *set,
 			set->control_dir : set->root_dir;
 		break;
 	case MAILBOX_LIST_PATH_TYPE_INDEX:
-		path = set->index_dir != NULL ?
-			set->index_dir : set->root_dir;
+		if (set->index_dir != NULL) {
+			if (set->index_dir[0] == '\0') {
+				/* in-memory indexes */
+				return 0;
+			}
+			path = set->index_dir;
+		} else {
+			path = set->root_dir;
+		}
 		break;
 	case MAILBOX_LIST_PATH_TYPE_INDEX_PRIVATE:
 		path = set->index_pvt_dir;