From: Timo Sirainen Date: Wed, 3 Feb 2021 23:10:57 +0000 (+0200) Subject: global: Set dns_lookup_settings.event_parent X-Git-Tag: 2.3.15~152 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91be6213117eb5b1a06e5db6153a01d295dcad59;p=thirdparty%2Fdovecot%2Fcore.git global: Set dns_lookup_settings.event_parent --- diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c index 4d875336fe..51b44d9e2d 100644 --- a/src/auth/auth-request.c +++ b/src/auth/auth-request.c @@ -2146,6 +2146,7 @@ static int auth_request_proxy_host_lookup(struct auth_request *request, i_zero(&dns_set); dns_set.dns_client_socket_path = AUTH_DNS_SOCKET_PATH; dns_set.timeout_msecs = AUTH_DNS_DEFAULT_TIMEOUT_MSECS; + dns_set.event_parent = request->event; value = auth_fields_find(request->fields.extra_fields, "proxy_timeout"); if (value != NULL) { if (str_to_uint(value, &secs) < 0) { diff --git a/src/lib-http/http-client-host.c b/src/lib-http/http-client-host.c index 95b10b7a00..1445d0de11 100644 --- a/src/lib-http/http-client-host.c +++ b/src/lib-http/http-client-host.c @@ -158,6 +158,7 @@ http_client_host_shared_lookup(struct http_client_host_shared *hshared) dns_set.dns_client_socket_path = cctx->dns_client_socket_path; dns_set.timeout_msecs = cctx->dns_lookup_timeout_msecs; dns_set.ioloop = cctx->ioloop; + dns_set.event_parent = hshared->event; (void)dns_lookup(hshared->name, &dns_set, http_client_host_shared_dns_callback, hshared, &hshared->dns_lookup); diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c index 3d8887d790..0aed95da5b 100644 --- a/src/lib-imap-client/imapc-connection.c +++ b/src/lib-imap-client/imapc-connection.c @@ -1893,6 +1893,7 @@ void imapc_connection_connect(struct imapc_connection *conn) dns_set.dns_client_socket_path = conn->client->set.dns_client_socket_path; dns_set.timeout_msecs = conn->client->set.connect_timeout_msecs; + dns_set.event_parent = conn->client->event; imapc_connection_set_state(conn, IMAPC_CONNECTION_STATE_CONNECTING); if (conn->ips_count > 0) { diff --git a/src/lib-program-client/program-client-remote.c b/src/lib-program-client/program-client-remote.c index a9e7c33f0e..e25fef3767 100644 --- a/src/lib-program-client/program-client-remote.c +++ b/src/lib-program-client/program-client-remote.c @@ -490,6 +490,7 @@ program_client_net_connect_init(struct program_client *pclient) pclient->set.dns_client_socket_path; prclient->dns_set.timeout_msecs = pclient->set.client_connect_timeout_msecs; + prclient->dns_set.event_parent = pclient->event; dns_lookup(prclient->address, &prclient->dns_set, program_client_net_connect_resolved, prclient, &prclient->lookup); diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c index 91f7e06a3a..80aa75c835 100644 --- a/src/lib-smtp/smtp-client-connection.c +++ b/src/lib-smtp/smtp-client-connection.c @@ -1692,6 +1692,7 @@ smtp_client_connection_lookup_ip(struct smtp_client_connection *conn) dns_set.dns_client_socket_path = conn->set.dns_client_socket_path; dns_set.timeout_msecs = conn->set.connect_timeout_msecs; + dns_set.event_parent = conn->event; e_debug(conn->event, "Performing asynchronous DNS lookup"); (void)dns_lookup(conn->host, &dns_set, smtp_client_connection_dns_callback, conn, diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c index 9fe2d5eea3..df0bc6d795 100644 --- a/src/lib-storage/index/pop3c/pop3c-client.c +++ b/src/lib-storage/index/pop3c/pop3c-client.c @@ -272,6 +272,7 @@ static int pop3c_client_dns_lookup(struct pop3c_client *client) dns_set.dns_client_socket_path = client->set.dns_client_socket_path; dns_set.timeout_msecs = POP3C_DNS_LOOKUP_TIMEOUT_MSECS; + dns_set.event_parent = client->event; if (dns_lookup(client->set.host, &dns_set, pop3c_dns_callback, client, &client->dns_lookup) < 0)