lib-storage: Another fix to mail storage initialization.

Allow mail_namespaces_init_location() to add the namespace directly to user,
since that's what the current callers always want. But compared to the
original code we're now calling mail_namespaces_init_finish() rather than
doing the same things ourself.

diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c
index a8ac2c6c1d30c666498f39ce08a3493e8a2e47c0..6b8089462624fbf414c37e0526e0c5029628eac5 100644 (file)
--- a/src/lib-storage/mail-namespace.c
+++ b/src/lib-storage/mail-namespace.c
@@ -405,8 +405,7 @@ int mail_namespaces_init(struct mail_user *user, const char **error_r)
 
        if (namespaces == NULL) {
                /* no namespaces defined, create a default one */
-               if (mail_namespaces_init_location(user, NULL, error_r) < 0)
-                       return -1;
+               return mail_namespaces_init_location(user, NULL, error_r);
        }
        return mail_namespaces_init_finish(namespaces, error_r);
 }
@@ -492,7 +491,7 @@ int mail_namespaces_init_location(struct mail_user *user, const char *location,
                mail_namespace_free(ns);
                return -1;
        }
-       return 0;
+       return mail_namespaces_init_finish(ns, error_r);
 }
 
 struct mail_namespace *mail_namespaces_init_empty(struct mail_user *user)