]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveadm: Stop reading per-connection settings
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Wed, 8 Mar 2023 14:49:35 +0000 (16:49 +0200)
committerTimo Sirainen <timo.sirainen@open-xchange.com>
Mon, 20 Nov 2023 12:20:55 +0000 (14:20 +0200)
This is no longer necessary. The filtering is done by
master_service_settings_get()

src/doveadm/client-connection.c

index 1d28b605efbd5867c2ae91d45fd3dda326886b99..da82ea9c9830e9cac560695c20043cf6f6436767 100644 (file)
@@ -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);