From 89dbf4b5935dff247c9249cef657bd752fc9891f Mon Sep 17 00:00:00 2001 From: Marco Bettini Date: Wed, 2 Oct 2024 14:19:33 +0000 Subject: [PATCH] lib-ldap: ldap_search_input - Drop timeout_secs --- src/lib-dict-backend/dict-ldap.c | 1 - src/lib-ldap/ldap-client.h | 2 -- src/lib-ldap/ldap-search.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c index b76757eb30..80adf97843 100644 --- a/src/lib-dict-backend/dict-ldap.c +++ b/src/lib-dict-backend/dict-ldap.c @@ -440,7 +440,6 @@ void ldap_dict_lookup_async(struct dict *dict, } input.filter = str_c(query); input.attributes = attributes; - input.timeout_secs = ctx->set->timeout; ctx->pending++; ldap_search_start(ctx->client, &input, ldap_dict_lookup_callback, op); } else { diff --git a/src/lib-ldap/ldap-client.h b/src/lib-ldap/ldap-client.h index bb9b6de5b3..f671e21575 100644 --- a/src/lib-ldap/ldap-client.h +++ b/src/lib-ldap/ldap-client.h @@ -27,8 +27,6 @@ struct ldap_search_input { enum ldap_scope scope; unsigned int size_limit; - - unsigned int timeout_secs; }; struct ldap_compare_input { diff --git a/src/lib-ldap/ldap-search.c b/src/lib-ldap/ldap-search.c index 694fd6dfaf..24a01a72da 100644 --- a/src/lib-ldap/ldap-search.c +++ b/src/lib-ldap/ldap-search.c @@ -163,7 +163,7 @@ void ldap_connection_search_start(struct ldap_connection *conn, req->send_request_cb = ldap_search_send; sctx->input = &req->input.search; req->ctx = sctx; - req->timeout_secs = input->timeout_secs; + req->timeout_secs = conn->set.timeout_secs; ldap_connection_queue_request(conn, req); } -- 2.47.3