Mercurial > dovecot > core-2.2

changeset 12522:a4e683282d1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: Fixed error handling when trying to delete mailbox under noinferiors mailbox.
author Timo Sirainen <tss@iki.fi>
date Sun, 05 Dec 2010 23:48:34 +0000
parents b22766c1aa51
children 25958384d938
files src/lib-storage/list/mailbox-list-fs.c src/lib-storage/list/mailbox-list-maildir.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/list/mailbox-list-fs.c	Sun Dec 05 23:44:38 2010 +0000
+++ b/src/lib-storage/list/mailbox-list-fs.c	Sun Dec 05 23:48:34 2010 +0000
@@ -434,7 +434,7 @@
 	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) {
--- a/src/lib-storage/list/mailbox-list-maildir.c	Sun Dec 05 23:44:38 2010 +0000
+++ b/src/lib-storage/list/mailbox-list-maildir.c	Sun Dec 05 23:48:34 2010 +0000
@@ -440,7 +440,7 @@
 	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 {