From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 20 Mar 2024 13:43:35 +0000 (+0200)
Subject: global: Use full setting names in filter_array_field_name
X-Git-Tag: 2.4.1~915
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9095228486ee7c9c4fb6c6f55ba6fb0a57d9b367;p=thirdparty%2Fdovecot%2Fcore.git

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 3ff79fbacb..1ef3239c15 100644
--- 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 b3b1d74088..0d21f24e3d 100644
--- 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 54aa0909e4..dd9210fc84 100644
--- 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 d8c845befb..0c37d77178 100644
--- 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 af67e83b3b..feb4db1aa7 100644
--- 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 8ef361d517..54d6752175 100644
--- 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,