dovecot-2.1: lib-storage: Convert INBOX to uppercase also when n...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/3ec0d772be49
changeset: 14900:3ec0d772be49
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Feb 06 19:00:52 2013 +0200
description:
lib-storage: Convert INBOX to uppercase also when namespace has inbox=no.
This fixes assert-crash in mailbox_check_mismatching_separators().

diffstat:

 src/lib-storage/mail-storage.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r a54f749f5a44 -r 3ec0d772be49 src/lib-storage/mail-storage.c
--- a/src/lib-storage/mail-storage.c	Wed Feb 06 18:29:22 2013 +0200
+++ b/src/lib-storage/mail-storage.c	Wed Feb 06 19:00:52 2013 +0200
@@ -627,10 +627,12 @@
 
 	i_assert(uni_utf8_str_is_valid(vname));
 
-	if ((list->ns->flags & NAMESPACE_FLAG_INBOX_USER) != 0 &&
-	    strncasecmp(vname, "INBOX", 5) == 0 &&
+	if (strncasecmp(vname, "INBOX", 5) == 0 &&
 	    strncmp(vname, "INBOX", 5) != 0) {
-		/* make sure INBOX shows up in uppercase everywhere */
+		/* make sure INBOX shows up in uppercase everywhere. do this
+		   regardless of whether we're in inbox=yes namespace, because
+		   clients expect INBOX to be case insensitive regardless of
+		   server's internal configuration. */
 		if (vname[5] == '\0')
 			vname = "INBOX";
 		else if (vname[5] == mail_namespace_get_sep(list->ns))