From 8c62ca091d23c2df1bd7400501b2e412f8c76b9f Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 9 Feb 2009 20:07:40 -0500 Subject: [PATCH] Give an error if inbox=yes namespace is missing. Previously we attempted to set it automatically, but that didn't work. --HG-- branch : HEAD --- src/lib-storage/mail-namespace.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c index 657732bc06..a80ac1e4f0 100644 --- a/src/lib-storage/mail-namespace.c +++ b/src/lib-storage/mail-namespace.c @@ -132,8 +132,7 @@ namespace_add_env(const char *data, unsigned int num, static bool namespaces_check(struct mail_namespace *namespaces) { - struct mail_namespace *ns, *inbox_ns = NULL, *private_ns = NULL; - unsigned int private_ns_count = 0; + struct mail_namespace *ns, *inbox_ns = NULL; unsigned int subscriptions_count = 0; char list_sep = '\0'; @@ -147,10 +146,6 @@ static bool namespaces_check(struct mail_namespace *namespaces) } inbox_ns = ns; } - if (ns->type == NAMESPACE_PRIVATE) { - private_ns = ns; - private_ns_count++; - } if (*ns->prefix != '\0' && (ns->flags & NAMESPACE_FLAG_LIST_PREFIX) != 0 && ns->prefix[strlen(ns->prefix)-1] != ns->sep) { @@ -181,15 +176,9 @@ static bool namespaces_check(struct mail_namespace *namespaces) } if (inbox_ns == NULL) { - if (private_ns_count == 1) { - /* just one private namespace. we'll assume it's - the INBOX namespace. */ - private_ns->flags |= NAMESPACE_FLAG_INBOX; - } else { - i_error("namespace configuration error: " - "inbox=yes namespace missing"); - return FALSE; - } + i_error("namespace configuration error: " + "inbox=yes namespace missing"); + return FALSE; } if (list_sep == '\0') { i_error("namespace configuration error: " -- 2.47.3