From: Siavash Tavakoli <siavash.tavakoli@open-xchange.com>
Date: Mon, 3 May 2021 11:15:54 +0000 (+0100)
Subject: lib-dict: Remove dict_settings.value_type
X-Git-Tag: 2.3.17~393
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53fa6616c54d3e3d7dbd9db2a12584b6f9f152fa;p=thirdparty%2Fdovecot%2Fcore.git

lib-dict: Remove dict_settings.value_type

It was originally added to dict-db and no other backend uses it. With dict-db
removed, there is no need to keep it.
---

diff --git a/src/auth/db-oauth2.c b/src/auth/db-oauth2.c
index 68946d5ef2..7d1874efec 100644
--- a/src/auth/db-oauth2.c
+++ b/src/auth/db-oauth2.c
@@ -296,7 +296,6 @@ struct db_oauth2 *db_oauth2_init(const char *config_path)
 		struct dict_settings dict_set = {
 			.username = "",
 			.base_dir = global_auth_settings->base_dir,
-			.value_type = DICT_DATA_TYPE_STRING,
 			.event_parent = auth_event,
 		};
 		if (dict_init(db->set.local_validation_key_dict, &dict_set,
diff --git a/src/dict/dict-connection.c b/src/dict/dict-connection.c
index 2375c78f49..b7b36a1f5d 100644
--- a/src/dict/dict-connection.c
+++ b/src/dict/dict-connection.c
@@ -94,7 +94,6 @@ static int dict_connection_dict_init(struct dict_connection *conn)
 	uri = strlist[i+1];
 
 	i_zero(&dict_set);
-	dict_set.value_type = conn->value_type;
 	dict_set.username = conn->username;
 	dict_set.base_dir = dict_settings->base_dir;
 	dict_set.event_parent = conn->conn.event;
diff --git a/src/lib-dict/dict-client.c b/src/lib-dict/dict-client.c
index c34232a98a..3539e6b920 100644
--- a/src/lib-dict/dict-client.c
+++ b/src/lib-dict/dict-client.c
@@ -750,7 +750,6 @@ client_dict_init(struct dict *driver, const char *uri,
 	dict->dict = *driver;
 	dict->conn.dict = dict;
 	dict->conn.conn.event_parent = set->event_parent;
-	dict->value_type = set->value_type;
 	dict->username = i_strdup(set->username);
 	dict->idle_msecs = idle_msecs;
 	dict->warn_slow_msecs = warn_slow_msecs;
diff --git a/src/lib-dict/dict.h b/src/lib-dict/dict.h
index 47b0f170bd..194bcb4758 100644
--- a/src/lib-dict/dict.h
+++ b/src/lib-dict/dict.h
@@ -32,7 +32,6 @@ enum dict_data_type {
 };
 
 struct dict_settings {
-	enum dict_data_type value_type;
 	const char *username;
 	const char *base_dir;
 	/* home directory for the user, if known */
diff --git a/src/lib-oauth2/test-oauth2-jwt.c b/src/lib-oauth2/test-oauth2-jwt.c
index 4c627e7275..80aa82c9a1 100644
--- a/src/lib-oauth2/test-oauth2-jwt.c
+++ b/src/lib-oauth2/test-oauth2-jwt.c
@@ -782,7 +782,6 @@ static void test_do_init(void)
 	};
 	struct dict_settings dict_set = {
 		.username = "testuser",
-		.value_type = DICT_DATA_TYPE_STRING,
 		.base_dir = ".",
 	};