mbox: LIST "" invalid-directory/% doesn't anymore give internal error

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/mbox/mbox-list.c b/src/lib-storage/index/mbox/mbox-list.c
index 87b1e90b08ce17672888a613caf3f7beebd44df9..44f35cf5763a24c90d7061b3917f783d7dd49ecb 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-list.c
+++ b/src/lib-storage/index/mbox/mbox-list.c
@@ -72,8 +72,9 @@ static int list_opendir(struct mail_storage *storage,
        if (*dirp != NULL)
                return 1;
 
-       if (!root && (errno == ENOENT || errno == ENOTDIR)) {
-               /* probably just race condition with other client
+       if (errno == ENOENT || errno == ENOTDIR) {
+               /* root) user gave invalid hiearchy, ignore
+                  sub) probably just race condition with other client
                   deleting the mailbox. */
                return 0;
        }
@@ -128,9 +129,11 @@ mbox_list_mailbox_init(struct mail_storage *storage, const char *mask,
        virtual_path = mask_get_dir(mask);
 
        path = mbox_get_path(storage, virtual_path);
-       if (list_opendir(storage, path, TRUE, &dirp) <= 0)
+       if (list_opendir(storage, path, TRUE, &dirp) < 0)
                return NULL;
 
+       /* if user gave invalid directory, we just don't show any results. */
+
        ctx = i_new(struct mailbox_list_context, 1);
        ctx->storage = storage;
        ctx->flags = flags;
@@ -139,15 +142,17 @@ mbox_list_mailbox_init(struct mail_storage *storage, const char *mask,
 
        if (virtual_path == NULL && imap_match(ctx->glob, "INBOX") > 0)
                ctx->next = mbox_list_inbox;
-       else if (virtual_path != NULL)
+       else if (virtual_path != NULL && dirp != NULL)
                ctx->next = mbox_list_path;
        else
                ctx->next = mbox_list_next;
 
-       ctx->dir = i_new(struct list_dir_context, 1);
-       ctx->dir->dirp = dirp;
-       ctx->dir->real_path = i_strdup(path);
-       ctx->dir->virtual_path = i_strdup(virtual_path);
+       if (dirp != NULL) {
+               ctx->dir = i_new(struct list_dir_context, 1);
+               ctx->dir->dirp = dirp;
+               ctx->dir->real_path = i_strdup(path);
+               ctx->dir->virtual_path = i_strdup(virtual_path);
+       }
        return ctx;
 }