From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 23 Mar 2021 10:10:22 +0000 (+0100)
Subject: smb2_tcon: also try to cancel pending compound requests on tdis
X-Git-Tag: tevent-0.11.0~1365
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b448eae5e983dcf3b7a222c5fc9a73eba88d1b06;p=thirdparty%2Fsamba.git

smb2_tcon: also try to cancel pending compound requests on tdis

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
---

diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index d7e0cf90f47..14229366efa 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -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);
 			}