From e1012a842d073c2e49f20b8c8e9e176543e47106 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 24 Mar 2009 17:18:56 -0400 Subject: [PATCH] dbox: Changed the default mailbox dir name, subscriptions and uidvalidity filenames. --HG-- branch : HEAD --- src/lib-storage/index/dbox/dbox-storage.c | 7 +++++-- src/lib-storage/index/dbox/dbox-storage.h | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib-storage/index/dbox/dbox-storage.c b/src/lib-storage/index/dbox/dbox-storage.c index 2703a36694..18e1d54fee 100644 --- a/src/lib-storage/index/dbox/dbox-storage.c +++ b/src/lib-storage/index/dbox/dbox-storage.c @@ -60,6 +60,7 @@ dbox_get_list_settings(struct mailbox_list_settings *list_set, memset(list_set, 0, sizeof(*list_set)); list_set->subscription_fname = DBOX_SUBSCRIPTION_FILE_NAME; list_set->maildir_name = DBOX_MAILDIR_NAME; + list_set->mailbox_dir_name = DBOX_MAILBOX_DIR_NAME; if (data == NULL || *data == '\0' || *data == ':') { /* we won't do any guessing for this format. */ @@ -71,8 +72,10 @@ dbox_get_list_settings(struct mailbox_list_settings *list_set, if (debug) i_info("dbox: data=%s", data); - return mailbox_list_settings_parse(data, list_set, storage->ns, - layout_r, alt_dir_r, error_r); + if (mailbox_list_settings_parse(data, list_set, storage->ns, + layout_r, alt_dir_r, error_r) < 0) + return -1; + return 0; } static struct mail_storage *dbox_alloc(void) diff --git a/src/lib-storage/index/dbox/dbox-storage.h b/src/lib-storage/index/dbox/dbox-storage.h index 0f4bac751f..349b1d676d 100644 --- a/src/lib-storage/index/dbox/dbox-storage.h +++ b/src/lib-storage/index/dbox/dbox-storage.h @@ -5,10 +5,11 @@ #include "mailbox-list-private.h" #define DBOX_STORAGE_NAME "dbox" -#define DBOX_SUBSCRIPTION_FILE_NAME ".dbox-subscriptions" -#define DBOX_UIDVALIDITY_FILE_NAME ".dbox-uidvalidity" +#define DBOX_SUBSCRIPTION_FILE_NAME "subscriptions" +#define DBOX_UIDVALIDITY_FILE_NAME "dovecot-uidvalidity" #define DBOX_INDEX_PREFIX "dovecot.index" +#define DBOX_MAILBOX_DIR_NAME "mailboxes" #define DBOX_MAILDIR_NAME "dbox-Mails" #define DBOX_GLOBAL_INDEX_PREFIX "dovecot.map.index" #define DBOX_GLOBAL_DIR_NAME "storage" -- 2.47.3