From: Ralph Boehme <slow@samba.org>
Date: Wed, 17 Mar 2021 15:24:28 +0000 (+0100)
Subject: smbd: cancel pending poll open timer in poll_open_done()
X-Git-Tag: tevent-0.11.0~1461
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=171a58ff3e8ee07cf5d7af08eabcb4a7379e7ce5;p=thirdparty%2Fsamba.git

smbd: cancel pending poll open timer in poll_open_done()

The retry of the open is scheduled below, avoid rescheduling it a second time in
the open retry timeout function.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14672
CI: https://gitlab.com/samba-team/samba/-/merge_requests/1843

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index fd4536b4914..1659df90366 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3041,6 +3041,7 @@ static void poll_open_done(struct tevent_req *subreq)
 	status = share_mode_watch_recv(subreq, NULL, NULL);
 	TALLOC_FREE(subreq);
 	open_rec->watch_req = NULL;
+	TALLOC_FREE(open_rec->te);
 
 	DBG_DEBUG("dbwrap_watched_watch_recv returned %s\n",
 		  nt_errstr(status));