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

diff --git a/src/lib-storage/list/mailbox-list-fs.c b/src/lib-storage/list/mailbox-list-fs.c
index d22246081cf6b80db4dc6b1f7a7091fd27e21af5..9db56cdad623002394bc7516c17b13b33b61ef66 100644 (file)
--- 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 859221d8612880811fc1aff89cdc4deceee9e217..f11eb452998e45514c0bc98a0a43b6ab0d3fa953 100644 (file)
--- 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 {