Mercurial > dovecot > core-2.2
changeset 10176:9e0123366fc5 HEAD
services, unix/fifo_listeners and namespaces are now sections with unique name.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Fri, 23 Oct 2009 19:11:19 -0400 |
parents | eaac22ecc168 |
children | d589d568a19d |
files | src/lib-storage/mail-storage-settings.c src/master/master-settings.c |
diffstat | 2 files changed, 15 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/mail-storage-settings.c Fri Oct 23 19:10:42 2009 -0400 +++ b/src/lib-storage/mail-storage-settings.c Fri Oct 23 19:11:19 2009 -0400 @@ -123,11 +123,11 @@ }; #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 @@ 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
--- a/src/master/master-settings.c Fri Oct 23 19:10:42 2009 -0400 +++ b/src/master/master-settings.c Fri Oct 23 19:11:19 2009 -0400 @@ -86,10 +86,13 @@ #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 @@ 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 @@ }; #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 @@ 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 };