From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 8 Mar 2023 14:49:35 +0000 (+0200)
Subject: doveadm: Stop reading per-connection settings
X-Git-Tag: 2.4.0~2232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b27b31125e9d11515b643ce4d92f0465b76b53;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Stop reading per-connection settings

This is no longer necessary. The filtering is done by
master_service_settings_get()
---

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index 1d28b605ef..da82ea9c98 100644
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -32,18 +32,9 @@ bool doveadm_client_is_allowed_command(const struct doveadm_settings *set,
 
 static int client_connection_read_settings(struct client_connection *conn)
 {
-	struct master_service_settings_input input;
-	struct master_service_settings_output output;
 	const char *error;
 
-	i_zero(&input);
-	input.service = "doveadm";
-	input.local_ip = conn->local_ip;
-	input.remote_ip = conn->remote_ip;
-
-	if (master_service_settings_read(master_service, &input,
-					 &output, &error) < 0 ||
-	    master_service_settings_get(conn->event,
+	if (master_service_settings_get(conn->event,
 					&doveadm_setting_parser_info, 0,
 					&conn->set, &error) < 0) {
 		e_error(conn->event, "%s", error);