summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-09-22 04:06:27 +0200
committerKarolin Seeger <kseeger@samba.org>2012-09-28 09:23:07 +0200
commit021dd55db013b552859afaf3f5a59fb2edb9f805 (patch)
tree597a22da1299f29909cd937e4325a91b038197d8
parent9f73827a8450d0598781fd85f08236d478670d23 (diff)
downloadsamba-021dd55db013b552859afaf3f5a59fb2edb9f805.tar.gz
s3:smbd:smb2: add check for session_status for compound requests (cherry picked from commit 27d38b5c27bd96d5124c175d946718bf0836b8f4)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/smbd/smb2_server.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index bf7f437bebd..8443ed775a8 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -2002,13 +2002,13 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
/*
* This check is mostly for giving the correct error code
* for compounded requests.
- *
- * TODO: we may need to move this after the session
- * and tcon checks.
*/
if (!NT_STATUS_IS_OK(req->next_status)) {
return smbd_smb2_request_error(req, req->next_status);
}
+ if (!NT_STATUS_IS_OK(session_status)) {
+ return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+ }
} else {
req->compat_chain_fsp = NULL;
}