sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3:smbd: return the correct error for cancelled SMB2 notifies on expired sessions

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13197

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2017-12-21 14:47:06 +01:00 committed by Jeremy Allison
parent f60af3b61c
commit cfaba68478
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/smbd/notify.c
View File

@ -391,12 +391,21 @@ static void smbd_notify_cancel_by_map(struct notify_mid_map *map)
NTSTATUS notify_status = NT_STATUS_CANCELLED;
if (smb2req != NULL) {
NTSTATUS sstatus;
if (smb2req->session == NULL) {
notify_status = STATUS_NOTIFY_CLEANUP;
} else if (!NT_STATUS_IS_OK(smb2req->session->status)) {
notify_status = STATUS_NOTIFY_CLEANUP;
sstatus = NT_STATUS_USER_SESSION_DELETED;
} else {
sstatus = smb2req->session->status;
}
if (smb2req->tcon == NULL) {
if (NT_STATUS_EQUAL(sstatus, NT_STATUS_NETWORK_SESSION_EXPIRED)) {
sstatus = NT_STATUS_OK;
}
if (!NT_STATUS_IS_OK(sstatus)) {
notify_status = STATUS_NOTIFY_CLEANUP;
} else if (smb2req->tcon == NULL) {
notify_status = STATUS_NOTIFY_CLEANUP;
} else if (!NT_STATUS_IS_OK(smb2req->tcon->status)) {
notify_status = STATUS_NOTIFY_CLEANUP;