auth, master: Replace setting_parser_info.default_settings with default_filter_settings

The default_settings are applied in wrong order, causing them to not work
correctly.

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 3240cca9832ad33e0db674948c713c2509bf518c..2c59b7c7c4491d1d7fe6d67241dc01325bf0c704 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -335,12 +335,8 @@ static const struct auth_settings auth_default_settings = {
        .first_valid_gid = 1,
        .last_valid_gid = 0,
 };
-static const struct setting_keyvalue auth_default_settings_keyvalue[] = {
-       { "auth_mechanisms", "plain" },
-       { NULL, NULL }
-};
-
 static const struct setting_keyvalue auth_default_filter_settings_keyvalue[] = {
+       { "auth_mechanisms", "plain" },
        { "auth_policy/http_client_request_absolute_timeout", "2s" },
        { "auth_policy/http_client_max_idle_time", "10s" },
        { "auth_policy/http_client_max_parallel_connections", "100" },
@@ -359,7 +355,6 @@ const struct setting_parser_info auth_setting_parser_info = {
 
        .defines = auth_setting_defines,
        .defaults = &auth_default_settings,
-       .default_settings = auth_default_settings_keyvalue,
        .default_filter_settings = auth_default_filter_settings_keyvalue,
 
        .struct_size = sizeof(struct auth_settings),

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 817de24bfbf14177742a6dd2b075c983f8ae568e..00490393beb8bbd4a402c1b119bfcdfcae96497a 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -243,7 +243,7 @@ const struct setting_parser_info master_setting_parser_info = {
 
        .defines = master_setting_defines,
        .defaults = &master_default_settings,
-       .default_settings = master_default_settings_keyvalue,
+       .default_filter_settings = master_default_settings_keyvalue,
 
        .struct_size = sizeof(struct master_settings),
        .pool_offset1 = 1 + offsetof(struct master_settings, pool),