]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
dbox: Set MAILBOX_NOCHILDREN flag for selectable mailboxes if we know it.
authorTimo Sirainen <tss@iki.fi>
Wed, 11 Jun 2008 23:08:16 +0000 (02:08 +0300)
committerTimo Sirainen <tss@iki.fi>
Wed, 11 Jun 2008 23:08:16 +0000 (02:08 +0300)
--HG--
branch : HEAD

src/lib-storage/index/dbox/dbox-storage.c

index a37c4aaf27b172e76a23733ab84d66d5e9933424..c8dfcaf089dc492fca5b6043923fddc38e33fffc 100644 (file)
@@ -634,11 +634,14 @@ static int dbox_list_iter_is_mailbox(struct mailbox_list_iterate_context *ctx
        if ((*flags & (MAILBOX_NOSELECT | MAILBOX_NONEXISTENT)) == 0) {
                /* make sure it's a selectable mailbox */
                maildir_path = t_strconcat(path, "/"DBOX_MAILDIR_NAME, NULL);
-               if (stat(maildir_path, &st2) < 0 || !S_ISDIR(st2.st_mode)) {
+               if (stat(maildir_path, &st2) < 0 || !S_ISDIR(st2.st_mode))
                        *flags |= MAILBOX_NOSELECT;
-                       if (st.st_nlink == 3 &&
-                           *ctx->list->set.maildir_name != '\0')
+               if (st.st_nlink == 3 && *ctx->list->set.maildir_name != '\0') {
+                       /* now we know what link count 3 means. */
+                       if ((*flags & MAILBOX_NOSELECT) != 0)
                                *flags |= MAILBOX_CHILDREN;
+                       else
+                               *flags |= MAILBOX_NOCHILDREN;
                }
        }
        return ret;