sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:smb2_tcon: cancel pending requests on all connections on tdis

Browse Source 
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11182

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2015-05-01 16:50:55 +02:00 committed by Jeremy Allison
parent 5871d3da87
commit f71941491b
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
source3/smbd/smb2_tcon.c
View File

@ -502,8 +502,7 @@ static struct tevent_req *smbd_smb2_tdis_send(TALLOC_CTX *mem_ctx,
struct tevent_req *req;
struct smbd_smb2_tdis_state *state;
struct tevent_req *subreq;
struct smbd_smb2_request *preq;
struct smbXsrv_connection *xconn = smb2req->xconn;
struct smbXsrv_connection *xconn = NULL;
req = tevent_req_create(mem_ctx, &state,
struct smbd_smb2_tdis_state);
@ -522,35 +521,40 @@ static struct tevent_req *smbd_smb2_tdis_send(TALLOC_CTX *mem_ctx,
*/
smb2req->tcon->status = NT_STATUS_NETWORK_NAME_DELETED;
for (preq = xconn->smb2.requests; preq != NULL; preq = preq->next) {
if (preq == smb2req) {
/* Can't cancel current request. */
continue;
}
if (preq->tcon != smb2req->tcon) {
/* Request on different tcon. */
continue;
}
xconn = smb2req->xconn->client->connections;
for (; xconn != NULL; xconn = xconn->next) {
struct smbd_smb2_request *preq;
/*
* Never cancel anything in a compound
* request. Way too hard to deal with
* the result.
*/
if (!preq->compound_related && preq->subreq != NULL) {
tevent_req_cancel(preq->subreq);
}
for (preq = xconn->smb2.requests; preq != NULL; preq = preq->next) {
if (preq == smb2req) {
/* Can't cancel current request. */
continue;
}
if (preq->tcon != smb2req->tcon) {
/* Request on different tcon. */
continue;
}
/*
* Now wait until the request is finished.
*
* We don't set a callback, as we just want to block the
* wait queue and the talloc_free() of the request will
* remove the item from the wait queue.
*/
subreq = tevent_queue_wait_send(preq, ev, state->wait_queue);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
/*
* Never cancel anything in a compound
* request. Way too hard to deal with
* the result.
*/
if (!preq->compound_related && preq->subreq != NULL) {
tevent_req_cancel(preq->subreq);
}
/*
* Now wait until the request is finished.
*
* We don't set a callback, as we just want to block the
* wait queue and the talloc_free() of the request will
* remove the item from the wait queue.
*/
subreq = tevent_queue_wait_send(preq, ev, state->wait_queue);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
}
}