mdssvc: move calling mds_es_search_set_pending() to mds_es_next_search_trigger()

This makes the calls to mds_es_search_set_pending() and
mds_es_search_unset_pending() symmetric. No change in behaviour.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14915

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Noel Power <npower@samba.org>

diff --git a/source3/rpc_server/mdssvc/mdssvc_es.c b/source3/rpc_server/mdssvc/mdssvc_es.c
index cc79b42d14f6b9c44374f53bde71ce7cb9c994d9..46f2917dbfec8b202c0ad9e8a1a93d380f54e2e7 100644 (file)
--- a/source3/rpc_server/mdssvc/mdssvc_es.c
+++ b/source3/rpc_server/mdssvc/mdssvc_es.c
@@ -112,6 +112,7 @@ static struct tevent_req *mds_es_connect_send(
 static int mds_es_connect_recv(struct tevent_req *req);
 static void mds_es_connected(struct tevent_req *subreq);
 static bool mds_es_next_search_trigger(struct mds_es_ctx *mds_es_ctx);
+static void mds_es_search_set_pending(struct sl_es_search *s);
 static void mds_es_search_unset_pending(struct sl_es_search *s);
 
 static bool mds_es_connect(struct mds_ctx *mds_ctx)
@@ -427,6 +428,7 @@ static bool mds_es_next_search_trigger(struct mds_es_ctx *mds_es_ctx)
                return false;
        }
        tevent_req_set_callback(subreq, mds_es_search_done, s);
+       mds_es_search_set_pending(s);
        return true;
 }
 
@@ -629,7 +631,6 @@ static struct tevent_req *mds_es_search_send(TALLOC_CTX *mem_ctx,
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }
-       mds_es_search_set_pending(s);
        tevent_req_set_callback(subreq, mds_es_search_http_send_done, req);
        return req;
 }