summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-08 10:54:46 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-09 21:23:44 +0200
commit26f37cba82e15872ce2b80044afd11b344b0f9c9 (patch)
tree5c0522f8ff1848c5b49858310d651ee385a37ab3 /source3/smbd
parent4bc10b5b72db0b874ce8171386ca9d66d973fe3c (diff)
downloadsamba-26f37cba82e15872ce2b80044afd11b344b0f9c9.tar.gz
samba-26f37cba82e15872ce2b80044afd11b344b0f9c9.tar.bz2
samba-26f37cba82e15872ce2b80044afd11b344b0f9c9.zip
s3:smb2_setinfo: make use of file_fsp_smb2()
metze
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/smb2_setinfo.c41
1 files changed, 12 insertions, 29 deletions
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index e0b51dff3d..14bb1dd7b6 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -29,11 +29,11 @@
static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
+ struct files_struct *in_fsp,
uint8_t in_info_type,
uint8_t in_file_info_class,
DATA_BLOB in_input_buffer,
- uint32_t in_additional_information,
- uint64_t in_file_id_volatile);
+ uint32_t in_additional_information);
static NTSTATUS smbd_smb2_setinfo_recv(struct tevent_req *req);
static void smbd_smb2_request_setinfo_done(struct tevent_req *subreq);
@@ -50,6 +50,7 @@ NTSTATUS smbd_smb2_request_process_setinfo(struct smbd_smb2_request *req)
uint32_t in_additional_information;
uint64_t in_file_id_persistent;
uint64_t in_file_id_volatile;
+ struct files_struct *in_fsp;
struct tevent_req *subreq;
status = smbd_smb2_request_verify_sizes(req, 0x21);
@@ -95,20 +96,17 @@ NTSTATUS smbd_smb2_request_process_setinfo(struct smbd_smb2_request *req)
return smbd_smb2_request_error(req, status);
}
- if (req->compat_chain_fsp) {
- /* skip check */
- } else if (in_file_id_persistent != in_file_id_volatile) {
+ in_fsp = file_fsp_smb2(req, in_file_id_persistent, in_file_id_volatile);
+ if (in_fsp == NULL) {
return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
}
- subreq = smbd_smb2_setinfo_send(req,
- req->sconn->ev_ctx,
- req,
+ subreq = smbd_smb2_setinfo_send(req, req->sconn->ev_ctx,
+ req, in_fsp,
in_info_type,
in_file_info_class,
in_input_buffer,
- in_additional_information,
- in_file_id_volatile);
+ in_additional_information);
if (subreq == NULL) {
return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
}
@@ -165,17 +163,16 @@ struct smbd_smb2_setinfo_state {
static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
+ struct files_struct *fsp,
uint8_t in_info_type,
uint8_t in_file_info_class,
DATA_BLOB in_input_buffer,
- uint32_t in_additional_information,
- uint64_t in_file_id_volatile)
+ uint32_t in_additional_information)
{
struct tevent_req *req = NULL;
struct smbd_smb2_setinfo_state *state = NULL;
struct smb_request *smbreq = NULL;
connection_struct *conn = smb2req->tcon->compat_conn;
- files_struct *fsp = NULL;
NTSTATUS status;
req = tevent_req_create(mem_ctx, &state,
@@ -185,28 +182,14 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
}
state->smb2req = smb2req;
- DEBUG(10,("smbd_smb2_setinfo_send: file_id[0x%016llX]\n",
- (unsigned long long)in_file_id_volatile));
+ DEBUG(10,("smbd_smb2_setinfo_send: %s - fnum[%d]\n",
+ fsp_str_dbg(fsp), fsp->fnum));
smbreq = smbd_smb2_fake_smb_request(smb2req);
if (tevent_req_nomem(smbreq, req)) {
return tevent_req_post(req, ev);
}
- fsp = file_fsp(smbreq, (uint16_t)in_file_id_volatile);
- if (fsp == NULL) {
- tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
- return tevent_req_post(req, ev);
- }
- if (conn != fsp->conn) {
- tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
- return tevent_req_post(req, ev);
- }
- if (smb2req->session->vuid != fsp->vuid) {
- tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
- return tevent_req_post(req, ev);
- }
-
if (IS_IPC(conn)) {
tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
return tevent_req_post(req, ev);