lib-storage: Don't crash if root mail directory isn't given.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index d21d141dc259525c8d8f217f93f95e913d66fac5..a26a781c5736e61d8169f13c29774b7c700129c5 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -130,7 +130,7 @@ mail_storage_get_class(struct mail_namespace *ns, const char *driver,
                                "Unknown mail storage driver %s", driver);
                        return NULL;
                }
-               i_assert(list_set->root_dir != NULL);
+
                storage_class->v.get_list_settings(ns, list_set);
                return storage_class;
        }
@@ -154,7 +154,6 @@ mail_storage_get_class(struct mail_namespace *ns, const char *driver,
        }
        return NULL;
 }
-
 static int
 mail_storage_create_root(struct mailbox_list *list,
                         enum mail_storage_flags flags, const char **error_r)
@@ -256,8 +255,9 @@ int mail_storage_create(struct mail_namespace *ns, const char *driver,
                        return -1;
        }
 
-       if ((flags & MAIL_STORAGE_FLAG_NO_AUTODETECTION) != 0 &&
-           list_set.root_dir == NULL) {
+       if ((list_set.root_dir == NULL || *list_set.root_dir == '\0') &&
+           (driver != NULL ||
+            (flags & MAIL_STORAGE_FLAG_NO_AUTODETECTION) != 0)) {
                *error_r = "Root mail directory not given";
                return -1;
        }