smbd: cancel pending poll open timer in poll_open_done()
authorRalph Boehme <slow@samba.org>
Wed, 17 Mar 2021 15:24:28 +0000 (16:24 +0100)
committerKarolin Seeger <kseeger@samba.org>
Wed, 31 Mar 2021 09:22:17 +0000 (09:22 +0000)
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>
(cherry picked from commit 171a58ff3e8ee07cf5d7af08eabcb4a7379e7ce5)

source3/smbd/open.c

index 5fd1dc0d321130b53e079e8b27dad69438f00def..0c2c381bde52ffd4fc7c438525a69639954661c5 100644 (file)
@@ -2995,6 +2995,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));