namespace section name now points to prefix, not type.

--HG--
branch : HEAD

diff --git a/doc/example-config/conf.d/mail.conf b/doc/example-config/conf.d/mail.conf
index 15f5e3518cfa3a3fb18e83b285b0e8319ea98831..cf3b7e875ecea1b38cc9fb8d8eb5114ea5f83d25 100644 (file)
--- a/doc/example-config/conf.d/mail.conf
+++ b/doc/example-config/conf.d/mail.conf
@@ -44,7 +44,10 @@
 # explicitly, ie. mail_location does nothing unless you have a namespace
 # without a location setting. Default namespace is simply done by having a
 # namespace with empty prefix.
-#namespace private {
+#namespace {
+   # Namespace type: private, shared or public
+   #type = private
+
    # Hierarchy separator to use. You should use the same separator for all
    # namespaces or some clients get confused. '/' is usually a good one.
    # The default however depends on the underlying mail storage format.

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index d95d31fafd30add1017bff9faad823cd44520b16..deb3568f3519870a8c988af5cb3f8ebf04ea2452 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -113,7 +113,7 @@ struct setting_parser_info mail_namespace_setting_parser_info = {
        MEMBER(defines) mail_namespace_setting_defines,
        MEMBER(defaults) &mail_namespace_default_settings,
 
-       MEMBER(type_offset) offsetof(struct mail_namespace_settings, type),
+       MEMBER(type_offset) offsetof(struct mail_namespace_settings, prefix),
        MEMBER(struct_size) sizeof(struct mail_namespace_settings),
 
        MEMBER(parent_offset) offsetof(struct mail_namespace_settings, user_set),