From: Timo Sirainen <tss@iki.fi>
Date: Sun, 5 Dec 2010 23:48:34 +0000 (+0000)
Subject: lib-storage: Fixed error handling when trying to delete mailbox under noinferiors... 
X-Git-Tag: 2.1.alpha1~460
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e4623e33bc4e37e61fcdc1e24e22327e49e303a;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Fixed error handling when trying to delete mailbox under noinferiors mailbox.
---

diff --git a/src/lib-storage/list/mailbox-list-fs.c b/src/lib-storage/list/mailbox-list-fs.c
index d22246081c..9db56cdad6 100644
--- a/src/lib-storage/list/mailbox-list-fs.c
+++ b/src/lib-storage/list/mailbox-list-fs.c
@@ -434,7 +434,7 @@ static int fs_list_delete_dir(struct mailbox_list *list, const char *name)
 	if (fs_list_rmdir(list, name, path) == 0)
 		return 0;
 
-	if (errno == ENOENT) {
+	if (errno == ENOENT || errno == ENOTDIR) {
 		mailbox_list_set_error(list, MAIL_ERROR_NOTFOUND,
 			T_MAIL_ERR_MAILBOX_NOT_FOUND(name));
 	} else if (errno == ENOTEMPTY || errno == EEXIST) {
diff --git a/src/lib-storage/list/mailbox-list-maildir.c b/src/lib-storage/list/mailbox-list-maildir.c
index 859221d861..f11eb45299 100644
--- a/src/lib-storage/list/mailbox-list-maildir.c
+++ b/src/lib-storage/list/mailbox-list-maildir.c
@@ -440,7 +440,7 @@ static int maildir_list_delete_dir(struct mailbox_list *list, const char *name)
 	if (stat(path, &st) == 0) {
 		mailbox_list_set_error(list, MAIL_ERROR_EXISTS,
 				       "Mailbox exists");
-	} else if (errno == ENOENT) {
+	} else if (errno == ENOENT || errno == ENOTDIR) {
 		mailbox_list_set_error(list, MAIL_ERROR_NOTFOUND,
 			T_MAIL_ERR_MAILBOX_NOT_FOUND(name));
 	} else {