Maildir++: Fixed crash when listing subscriptions for a subscriptions=no namespace...

diff --git a/src/lib-storage/list/mailbox-list-maildir.c b/src/lib-storage/list/mailbox-list-maildir.c
index 8adb0dabb09c85f2b9d0972ff89e16ef1a320db4..11cc60eca98d21f2e5091ff62c8f2f02a89eb8ad 100644 (file)
--- a/src/lib-storage/list/mailbox-list-maildir.c
+++ b/src/lib-storage/list/mailbox-list-maildir.c
@@ -126,16 +126,6 @@ static bool maildir_list_is_valid_common_nonfs(const char *name)
        return TRUE;
 }
 
-static bool ATTR_NORETURN
-maildir_is_valid_pattern(struct mailbox_list *list ATTR_UNUSED,
-                        const char *pattern ATTR_UNUSED)
-{
-       i_unreached();
-#ifndef ATTRS_DEFINED
-       return FALSE;
-#endif
-}
-
 static bool
 maildir_is_valid_existing_name(struct mailbox_list *list, const char *name)
 {
@@ -150,6 +140,15 @@ maildir_is_valid_existing_name(struct mailbox_list *list, const char *name)
        return maildir_list_is_valid_common_nonfs(name);
 }
 
+static bool
+maildir_is_valid_pattern(struct mailbox_list *list, const char *pattern)
+{
+       /* maildir code itself doesn't care about this, but we may get here
+          from listing subscriptions to LAYOUT=fs namespace containing
+          entries for a subscriptions=no LAYOUT=maildir++ namespace */
+       return maildir_is_valid_existing_name(list, pattern);
+}
+
 static bool
 maildir_is_valid_create_name(struct mailbox_list *list, const char *name)
 {