dovecot-1.2: MAILBOXDIR changes broke some setups.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/50815f24cc22
changeset: 8838:50815f24cc22
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Mar 18 17:26:40 2009 -0400
description:
MAILBOXDIR changes broke some setups.

diffstat:

1 file changed, 10 insertions(+), 9 deletions(-)
src/lib-storage/mailbox-list.c |   19 ++++++++++---------

diffs (36 lines):

diff -r c9d6ae6f10fe -r 50815f24cc22 src/lib-storage/mailbox-list.c
--- a/src/lib-storage/mailbox-list.c	Wed Mar 18 14:40:58 2009 -0400
+++ b/src/lib-storage/mailbox-list.c	Wed Mar 18 17:26:40 2009 -0400
@@ -182,13 +182,6 @@ int mailbox_list_settings_parse(const ch
 
 	if (set->index_dir != NULL && strcmp(set->index_dir, "MEMORY") == 0)
 		set->index_dir = "";
-
-	if (set->mailbox_dir_name == NULL)
-		set->mailbox_dir_name = "";
-	else if (set->mailbox_dir_name[strlen(set->mailbox_dir_name)-1] != '/') {
-		set->mailbox_dir_name =
-			t_strconcat(set->mailbox_dir_name, "/", NULL);
-	}
 	return 0;
 }
 
@@ -221,8 +214,16 @@ void mailbox_list_init(struct mailbox_li
 	list->set.maildir_name =
 		(list->props & MAILBOX_LIST_PROP_NO_MAILDIR_NAME) != 0 ? "" :
 		p_strdup(list->pool, set->maildir_name);
-	list->set.mailbox_dir_name =
-		p_strdup(list->pool, set->mailbox_dir_name);
+
+	if (set->mailbox_dir_name == NULL)
+		list->set.mailbox_dir_name = "";
+	else if (set->mailbox_dir_name[strlen(set->mailbox_dir_name)-1] == '/') {
+		list->set.mailbox_dir_name =
+			p_strdup(list->pool, set->mailbox_dir_name);
+	} else {
+		list->set.mailbox_dir_name =
+			p_strconcat(list->pool, set->mailbox_dir_name, "/", NULL);
+	}
 
 	list->set.mail_storage_flags = set->mail_storage_flags;
 	list->set.lock_method = set->lock_method;