From: Timo Sirainen <tss@iki.fi>
Date: Wed, 15 Sep 2010 15:20:21 +0000 (+0100)
Subject: lib-storage: Fail if list=yes namespace prefix starts with hierarchy separator.
X-Git-Tag: 2.0.3~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98b27a037e337fdd3965469884245b409e3a1e84;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Fail if list=yes namespace prefix starts with hierarchy separator.
---

diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c
index 1333408c96..1ae8daee2e 100644
--- a/src/lib-storage/mail-namespace.c
+++ b/src/lib-storage/mail-namespace.c
@@ -231,6 +231,15 @@ namespaces_check(struct mail_namespace *namespaces, const char **error_r)
 				"to end with separator", ns->prefix);
 			return FALSE;
 		}
+		if (*ns->prefix != '\0' &&
+		    (ns->flags & (NAMESPACE_FLAG_LIST_PREFIX |
+				  NAMESPACE_FLAG_LIST_CHILDREN)) != 0 &&
+		    ns->prefix[0] == ns->sep) {
+			*error_r = t_strdup_printf(
+				"list=yes requires prefix=%s "
+				"not to start with separator", ns->prefix);
+			return FALSE;
+		}
 		if ((ns->flags & (NAMESPACE_FLAG_LIST_PREFIX |
 				  NAMESPACE_FLAG_LIST_CHILDREN)) != 0) {
 			if (list_sep == '\0')