lib-storage: Improved storage creation failure error message for "auto" driver.

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 479346707bbc4478a9ab20d99bb4ab0edda9254e..e17835f53c07aa08a3b57f443309d4bdf624782e 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -180,12 +180,16 @@ mail_storage_get_class(struct mail_namespace *ns, const char *driver,
        if (storage_class != NULL)
                return storage_class;
 
-       if (ns->set->location == NULL || *ns->set->location == '\0') {
-               (void)mail_user_get_home(ns->user, &home);
-               if (home == NULL || *home == '\0') home = "(not set)";
+       (void)mail_user_get_home(ns->user, &home);
+       if (home == NULL || *home == '\0') home = "(not set)";
 
+       if (ns->set->location == NULL || *ns->set->location == '\0') {
                *error_r = t_strdup_printf(
                        "Mail storage autodetection failed with home=%s", home);
+       } else if (strncmp(ns->set->location, "auto:", 5) == 0) {
+               *error_r = t_strdup_printf(
+                       "Autodetection failed for %s (home=%s)",
+                       ns->set->location, home);
        } else {
                *error_r = t_strdup_printf(
                        "Ambiguous mail location setting, "