]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smb2_tcon: also try to cancel pending compound requests on tdis
authorStefan Metzmacher <metze@samba.org>
Tue, 23 Mar 2021 10:10:22 +0000 (11:10 +0100)
committerJeremy Allison <jra@samba.org>
Mon, 29 Mar 2021 20:43:28 +0000 (20:43 +0000)
There's no reason to do something special here.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Mar 29 20:43:28 UTC 2021 on sn-devel-184

source3/smbd/smb2_tcon.c

index d7e0cf90f47449191a272906a34a81389ae1114e..14229366efa9ca3c309febabf9eb0751f58a56da 100644 (file)
@@ -612,12 +612,7 @@ static struct tevent_req *smbd_smb2_tdis_send(TALLOC_CTX *mem_ctx,
                                continue;
                        }
 
-                       /*
-                        * Never cancel anything in a compound
-                        * request. Way too hard to deal with
-                        * the result.
-                        */
-                       if (!preq->compound_related && preq->subreq != NULL) {
+                       if (preq->subreq != NULL) {
                                tevent_req_cancel(preq->subreq);
                        }