lib-ldap: ldap_search_input - Drop timeout_secs

diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c
index b76757eb3056b433b265d740192f1506dfbd215a..80adf978437d4338781dcbc78b39bb5ad4083548 100644 (file)
--- 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 bb9b6de5b35f259d03731db2b6ef3f2b0f1d6a6e..f671e21575015f3975e872b8c0b277f61a72a32c 100644 (file)
--- 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 694fd6dfaf01597b7a849c55064a3c587c9fb2fc..24a01a72da21c6b54bb9d2af75efa986194f7079 100644 (file)
--- 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);
 }