From 2ace3f00a7b743112a98a125c9b85dfd69a82d11 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 23 Oct 2009 19:11:19 -0400 Subject: [PATCH] services, unix/fifo_listeners and namespaces are now sections with unique name. --HG-- branch : HEAD --- src/lib-storage/mail-storage-settings.c | 8 ++++---- src/master/master-settings.c | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c index deb3568f35..6f2a04c974 100644 --- 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 674df86511..0f3a1c0fa5 100644 --- 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 }; -- 2.47.3