From: Timo Sirainen Date: Thu, 27 May 2010 20:03:36 +0000 (+0100) Subject: doveadm: Added config dependency to mail_user settings. X-Git-Tag: 2.0.beta6~129 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3812d7a6263a4bb5f3c92b4d8fa1d6fc0fbcbe21;p=thirdparty%2Fdovecot%2Fcore.git doveadm: Added config dependency to mail_user settings. If doveadm gets the configuration by execing doveconf, it won't get these settings without the dependency. --HG-- branch : HEAD --- diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c index 120c97c661..9cc2845680 100644 --- a/src/doveadm/doveadm-settings.c +++ b/src/doveadm/doveadm-settings.c @@ -2,6 +2,7 @@ #include "lib.h" #include "settings-parser.h" +#include "mail-storage-settings.h" #include "doveadm-settings.h" #undef DEF @@ -25,6 +26,11 @@ const struct doveadm_settings doveadm_default_settings = { .plugin_envs = ARRAY_INIT }; +static const struct setting_parser_info *doveadm_setting_dependencies[] = { + &mail_user_setting_parser_info, + NULL +}; + const struct setting_parser_info doveadm_setting_parser_info = { .module_name = "doveadm", .defines = doveadm_setting_defines, @@ -33,7 +39,8 @@ const struct setting_parser_info doveadm_setting_parser_info = { .type_offset = (size_t)-1, .struct_size = sizeof(struct doveadm_settings), - .parent_offset = (size_t)-1 + .parent_offset = (size_t)-1, + .dependencies = doveadm_setting_dependencies }; const struct doveadm_settings *doveadm_settings;