Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8737:9c45d585227b HEAD
Give an error if inbox=yes namespace is missing.
Previously we attempted to set it automatically, but that didn't work.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Mon, 09 Feb 2009 20:07:40 -0500 |
parents | d23ab2c1c0c5 |
children | ce8f8ca3ac35 |
files | src/lib-storage/mail-namespace.c |
diffstat | 1 files changed, 4 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/mail-namespace.c Mon Feb 09 20:00:13 2009 -0500 +++ b/src/lib-storage/mail-namespace.c Mon Feb 09 20:07:40 2009 -0500 @@ -132,8 +132,7 @@ 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 @@ } 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 @@ } 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: "