From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 25 Jul 2017 06:35:31 +0000 (+0300)
Subject: lib-storage: If root dir already exists as file, log better error message.
X-Git-Tag: 2.3.0.rc1~1214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d85f37fe02fadcd5144560495a7196133c8ec947;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: If root dir already exists as file, log better error message.
---

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 482e651fa0..8dc2b578fe 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -1213,6 +1213,11 @@ int mailbox_list_try_mkdir_root(struct mailbox_list *list, const char *path,
 	if (stat(path, &st) == 0) {
 		/* looks like it already exists, don't bother checking
 		   further. */
+		if (!S_ISDIR(st.st_mode)) {
+			*error_r = t_strdup_printf(
+				"Root directory is a file: %s", path);
+			return -1;
+		}
 		return 0;
 	}