services, unix/fifo_listeners and namespaces are now sections with unique name.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index deb3568f3519870a8c988af5cb3f8ebf04ea2452..6f2a04c9746649dc5208058540554e50b8c457a5 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -123,11 +123,11 @@ struct setting_parser_info mail_namespace_setting_parser_info = {
 };
 
 #undef DEF
-#undef DEFLIST
+#undef DEFLIST_UNIQUE
 #define DEF(type, name) \
        { type, #name, offsetof(struct mail_user_settings, name), NULL }
-#define DEFLIST(field, name, defines) \
-       { SET_DEFLIST, name, \
+#define DEFLIST_UNIQUE(field, name, defines) \
+       { SET_DEFLIST_UNIQUE, name, \
          offsetof(struct mail_user_settings, field), defines }
 
 static struct setting_define mail_user_setting_defines[] = {
@@ -152,7 +152,7 @@ static struct setting_define mail_user_setting_defines[] = {
 
        DEF(SET_STR, mail_log_prefix),
 
-       DEFLIST(namespaces, "namespace", &mail_namespace_setting_parser_info),
+       DEFLIST_UNIQUE(namespaces, "namespace", &mail_namespace_setting_parser_info),
        { SET_STRLIST, "plugin", offsetof(struct mail_user_settings, plugin_envs), NULL },
 
        SETTING_DEFINE_LIST_END

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 674df8651184e4179170f5bfd22f374d35755bfa..0f3a1c0fa51fcf3ebb7bb665969108e2fcc82e00 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -86,10 +86,13 @@ static struct setting_parser_info inet_listener_setting_parser_info = {
 
 #undef DEF
 #undef DEFLIST
+#undef DEFLIST_UNIQUE
 #define DEF(type, name) \
        { type, #name, offsetof(struct service_settings, name), NULL }
 #define DEFLIST(field, name, defines) \
        { SET_DEFLIST, name, offsetof(struct service_settings, field), defines }
+#define DEFLIST_UNIQUE(field, name, defines) \
+       { SET_DEFLIST_UNIQUE, name, offsetof(struct service_settings, field), defines }
 
 static struct setting_define service_setting_defines[] = {
        DEF(SET_STR, name),
@@ -110,10 +113,10 @@ static struct setting_define service_setting_defines[] = {
        DEF(SET_UINT, service_count),
        DEF(SET_UINT, vsz_limit),
 
-       DEFLIST(unix_listeners, "unix_listener",
-               &file_listener_setting_parser_info),
-       DEFLIST(fifo_listeners, "fifo_listener",
-               &file_listener_setting_parser_info),
+       DEFLIST_UNIQUE(unix_listeners, "unix_listener",
+                      &file_listener_setting_parser_info),
+       DEFLIST_UNIQUE(fifo_listeners, "fifo_listener",
+                      &file_listener_setting_parser_info),
        DEFLIST(inet_listeners, "inet_listener",
                &inet_listener_setting_parser_info),
 
@@ -159,11 +162,11 @@ struct setting_parser_info service_setting_parser_info = {
 };
 
 #undef DEF
-#undef DEFLIST
+#undef DEFLIST_UNIQUE
 #define DEF(type, name) \
        { type, #name, offsetof(struct master_settings, name), NULL }
-#define DEFLIST(field, name, defines) \
-       { SET_DEFLIST, name, offsetof(struct master_settings, field), defines }
+#define DEFLIST_UNIQUE(field, name, defines) \
+       { SET_DEFLIST_UNIQUE, name, offsetof(struct master_settings, field), defines }
 
 static struct setting_define master_setting_defines[] = {
        DEF(SET_STR, base_dir),
@@ -185,7 +188,7 @@ static struct setting_define master_setting_defines[] = {
        DEF(SET_UINT, first_valid_gid),
        DEF(SET_UINT, last_valid_gid),
 
-       DEFLIST(services, "service", &service_setting_parser_info),
+       DEFLIST_UNIQUE(services, "service", &service_setting_parser_info),
 
        SETTING_DEFINE_LIST_END
 };