sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

s3: smbd: notify_mid_maps is used by both SMB1 and SMB2.

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@samba.org>
This commit is contained in:
Jeremy Allison 2021-09-08 15:06:11 -07:00 committed by David Mulder
parent 7debfe7a23
commit d972f64b30
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/smbd/globals.h
View File

@ -897,9 +897,7 @@ struct smbd_server_connection {
struct kernel_oplocks *kernel_ops;
} oplocks;
struct {
struct notify_mid_map *notify_mid_maps;
} smb1;
struct notify_mid_map *notify_mid_maps;
struct pthreadpool_tevent *pool;

8
source3/smbd/notify.c
View File

@ -366,7 +366,7 @@ NTSTATUS change_notify_add_request(struct smb_request *req,
DLIST_ADD_END(fsp->notify->requests, request);
map->mid = request->req->mid;
DLIST_ADD(sconn->smb1.notify_mid_maps, map);
DLIST_ADD(sconn->notify_mid_maps, map);
return NT_STATUS_OK;
}
@ -396,7 +396,7 @@ static void change_notify_remove_request(struct smbd_server_connection *sconn,
}
DLIST_REMOVE(fsp->notify->requests, req);
DLIST_REMOVE(sconn->smb1.notify_mid_maps, req->mid_map);
DLIST_REMOVE(sconn->notify_mid_maps, req->mid_map);
TALLOC_FREE(req);
}
@ -443,7 +443,7 @@ bool remove_pending_change_notify_requests_by_mid(
{
struct notify_mid_map *map;
for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
for (map = sconn->notify_mid_maps; map; map = map->next) {
if (map->mid == mid) {
break;
}
@ -462,7 +462,7 @@ void smbd_notify_cancel_by_smbreq(const struct smb_request *smbreq)
struct smbd_server_connection *sconn = smbreq->sconn;
struct notify_mid_map *map;
for (map = sconn->smb1.notify_mid_maps; map; map = map->next) {
for (map = sconn->notify_mid_maps; map; map = map->next) {
if (map->req->req == smbreq) {
break;
}