From: Ralph Boehme Date: Fri, 19 Nov 2021 12:21:31 +0000 (+0100) Subject: mdssvc: don't trigger http reconnect if a search was cancelled X-Git-Tag: samba-4.17.0rc1~117 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac13935a58518a3af34fd49701846b8dbe72b7b0;p=thirdparty%2Fsamba.git mdssvc: don't trigger http reconnect if a search was cancelled Calling tevent_req_error() triggers a HTTP reconnect in mds_es_search_done() as mds_es_search_recv() returns the error so we call mds_es_reconnect_on_error(). slq (which is s->slq) or s->mds_es_ctx will be NULL if the user closed a search or disconnected a share with an active mdssvc IPC pipe, no need to trigger a HTTP reconnect for those cases. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14915 Signed-off-by: Ralph Boehme Reviewed-by: Noel Power --- diff --git a/source3/rpc_server/mdssvc/mdssvc_es.c b/source3/rpc_server/mdssvc/mdssvc_es.c index 5e9d76dd1de..b9c9e5ca893 100644 --- a/source3/rpc_server/mdssvc/mdssvc_es.c +++ b/source3/rpc_server/mdssvc/mdssvc_es.c @@ -686,7 +686,7 @@ static void mds_es_search_http_send_done(struct tevent_req *subreq) } if (state->s->mds_es_ctx == NULL) { - tevent_req_error(req, ECANCELED); + tevent_req_done(req); return; } @@ -733,7 +733,7 @@ static void mds_es_search_http_read_done(struct tevent_req *subreq) return; } if (s->mds_es_ctx == NULL) { - tevent_req_error(req, ECANCELED); + tevent_req_done(req); return; }