From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Wed, 28 Feb 2024 16:00:04 +0000 (+0100)
Subject: lib-imap-client: Add necessary imap-client settings
X-Git-Tag: 2.4.1~823
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fc4620091828dae3e6727df4725cd43cba41bba;p=thirdparty%2Fdovecot%2Fcore.git

lib-imap-client: Add necessary imap-client settings

These attributes will be necessary in the next commit to fully replace
the imap-client settings handling from inside imapc_client_init().
---

diff --git a/src/lib-imap-client/imapc-settings.c b/src/lib-imap-client/imapc-settings.c
index f5f56f979f..57879bafb5 100644
--- a/src/lib-imap-client/imapc-settings.c
+++ b/src/lib-imap-client/imapc-settings.c
@@ -29,12 +29,15 @@ static const struct setting_define imapc_setting_defines[] = {
 	DEF(STR, imapc_list_prefix),
 	DEF(TIME, imapc_cmd_timeout),
 	DEF(TIME, imapc_max_idle_time),
+	DEF(TIME_MSECS, imapc_connection_timeout_interval),
 	DEF(UINT, imapc_connection_retry_count),
 	DEF(TIME_MSECS, imapc_connection_retry_interval),
 	DEF(SIZE, imapc_max_line_length),
 
 	DEF(STR, pop3_deleted_flag),
 
+	DEF(STR_HIDDEN, dns_client_socket_path),
+
 	SETTING_DEFINE_LIST_END
 };
 
@@ -55,11 +58,14 @@ static const struct imapc_settings imapc_default_settings = {
 	.imapc_list_prefix = "",
 	.imapc_cmd_timeout = 5*60,
 	.imapc_max_idle_time = 60*29,
+	.imapc_connection_timeout_interval = 1000*30,
 	.imapc_connection_retry_count = 1,
 	.imapc_connection_retry_interval = 1000,
 	.imapc_max_line_length = 0,
 
-	.pop3_deleted_flag = ""
+	.pop3_deleted_flag = "",
+
+	.dns_client_socket_path = "dns-client",
 };
 
 static const struct setting_keyvalue imapc_default_settings_keyvalue[] = {
diff --git a/src/lib-imap-client/imapc-settings.h b/src/lib-imap-client/imapc-settings.h
index 6bfdc6d2f0..4d372b859b 100644
--- a/src/lib-imap-client/imapc-settings.h
+++ b/src/lib-imap-client/imapc-settings.h
@@ -49,12 +49,15 @@ struct imapc_settings {
 	const char *imapc_list_prefix;
 	unsigned int imapc_cmd_timeout;
 	unsigned int imapc_max_idle_time;
+	unsigned int imapc_connection_timeout_interval;
 	unsigned int imapc_connection_retry_count;
 	unsigned int imapc_connection_retry_interval;
 	uoff_t imapc_max_line_length;
 
 	const char *pop3_deleted_flag;
 
+	const char *dns_client_socket_path;
+
 	enum imapc_features parsed_features;
 	unsigned int throttle_init_msecs;
 	unsigned int throttle_max_msecs;