global: Use full setting names in filter_array_field_name

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index 3ff79fbacbf010f2a156b55842ddde72114da955..1ef3239c15f9c8d6ae1e46a9295dd0af63409f2e 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -364,10 +364,10 @@ static const struct setting_define auth_setting_defines[] = {
 
        { .type = SET_FILTER_ARRAY, .key = "passdb",
          .offset = offsetof(struct auth_settings, passdbs),
-         .filter_array_field_name = "name", },
+         .filter_array_field_name = "passdb_name", },
        { .type = SET_FILTER_ARRAY, .key = "userdb",
          .offset = offsetof(struct auth_settings, userdbs),
-         .filter_array_field_name = "name", },
+         .filter_array_field_name = "userdb_name", },
 
        DEF_NOPREFIX(STR_HIDDEN, base_dir),
        DEF_NOPREFIX(BOOL, verbose_proctitle),

diff --git a/src/lib-language/lang-settings.c b/src/lib-language/lang-settings.c
index b3b1d7408806f9d3ad30d36698b5bd05a601bcb9..0d21f24e3dfd106e52bc06f1788d0e1df182fa6c 100644 (file)
--- a/src/lib-language/lang-settings.c
+++ b/src/lib-language/lang-settings.c
@@ -61,7 +61,7 @@ const struct setting_parser_info lang_setting_parser_info = {
 static const struct setting_define langs_setting_defines[] = {
        { .type = SET_FILTER_ARRAY, .key = "language",
          .offset = offsetof(struct langs_settings, languages),
-         .filter_array_field_name = "name", },
+         .filter_array_field_name = "language_name", },
        DEF(STR, textcat_config_path),
        SETTING_DEFINE_LIST_END
 };

diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c
index 54aa0909e4a978628dbf9c222d8444322f798b79..dd9210fc842af2c1e7d26f9247a04c587f04a4f4 100644 (file)
--- a/src/lib-sql/driver-mysql.c
+++ b/src/lib-sql/driver-mysql.c
@@ -66,7 +66,7 @@ struct mysql_settings {
 static const struct setting_define mysql_setting_defines[] = {
        { .type = SET_FILTER_ARRAY, .key = MYSQL_SQLPOOL_SET_NAME,
          .offset = offsetof(struct mysql_settings, sqlpool_hosts),
-         .filter_array_field_name = "host", },
+         .filter_array_field_name = "mysql_host", },
        DEF(UINT, connection_limit),
 
        DEF(STR, host),

diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index d8c845befb5998a9e4bf5444f082eaa7a4ddb46c..0c37d77178251487790c22f44b41d2ea6c48fde2 100644 (file)
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -35,7 +35,7 @@ struct pgsql_settings {
 static const struct setting_define pgsql_setting_defines[] = {
        { .type = SET_FILTER_ARRAY, .key = PGSQL_SQLPOOL_SET_NAME,
          .offset = offsetof(struct pgsql_settings, sqlpool_hosts),
-         .filter_array_field_name = "host", },
+         .filter_array_field_name = "pgsql_host", },
        DEF(UINT, connection_limit),
 
        DEF(STR, host),

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index af67e83b3b9d1aaeda6cbfff7a82a089619c05d1..feb4db1aa7144c6638098b28629971ce9b90189f 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -135,13 +135,13 @@ static const struct setting_define service_setting_defines[] = {
 
        { .type = SET_FILTER_ARRAY, .key = "unix_listener",
          .offset = offsetof(struct service_settings, unix_listeners),
-         .filter_array_field_name = "path", },
+         .filter_array_field_name = "unix_listener_path", },
        { .type = SET_FILTER_ARRAY, .key = "fifo_listener",
          .offset = offsetof(struct service_settings, fifo_listeners),
-         .filter_array_field_name = "path", },
+         .filter_array_field_name = "fifo_listener_path", },
        { .type = SET_FILTER_ARRAY, .key = "inet_listener",
          .offset = offsetof(struct service_settings, inet_listeners),
-         .filter_array_field_name = "name", },
+         .filter_array_field_name = "inet_listener_name", },
 
        SETTING_DEFINE_LIST_END
 };
@@ -206,7 +206,7 @@ static const struct setting_define master_setting_defines[] = {
 
        { .type = SET_FILTER_ARRAY, .key = "service",
          .offset = offsetof(struct master_settings, services),
-         .filter_array_field_name = "name", },
+         .filter_array_field_name = "service_name", },
 
        SETTING_DEFINE_LIST_END
 };

diff --git a/src/plugins/push-notification/push-notification-settings.c b/src/plugins/push-notification/push-notification-settings.c
index 8ef361d51787c7b7d056c878197ad804db3bcf6e..54d67521758cebd0b52e415c1161d0899c0daa74 100644 (file)
--- a/src/plugins/push-notification/push-notification-settings.c
+++ b/src/plugins/push-notification/push-notification-settings.c
@@ -58,7 +58,7 @@ static const struct setting_define push_notification_setting_defines[] = {
                .type = SET_FILTER_ARRAY,
                .key = PUSH_NOTIFICATION_SETTINGS_FILTER_NAME,
                .offset = offsetof(struct push_notification_settings, push_notifications),
-               .filter_array_field_name = "name",
+               .filter_array_field_name = "push_notification_name",
        },
 
        SETTING_DEFINE_LIST_END,