diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-03-12 22:48:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:06 -0500 |
| commit | a1b295ed4823ce8d06f830b8db9a5d965c934b54 (patch) | |
| tree | 2de735a28634c011930456f6591072a3c1471263 /source4/smb_server/smb/trans2.c | |
| parent | 33647bd841c1c74e7dc50e93379e372056ac2df1 (diff) | |
| download | samba-a1b295ed4823ce8d06f830b8db9a5d965c934b54.tar.gz samba-a1b295ed4823ce8d06f830b8db9a5d965c934b54.tar.bz2 samba-a1b295ed4823ce8d06f830b8db9a5d965c934b54.zip | |
r14256: - rename smb_file -> smb_handle
- move it into the in/out substructs again
- allow file.path only on smb_fileinfo/smb_setfileinfo
metze
(This used to be commit be6d5298a2cdb7e7c61d70471bad445645af5963)
Diffstat (limited to 'source4/smb_server/smb/trans2.c')
| -rw-r--r-- | source4/smb_server/smb/trans2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c index 113828fbfa..faf204607e 100644 --- a/source4/smb_server/smb/trans2.c +++ b/source4/smb_server/smb/trans2.c @@ -459,7 +459,7 @@ static NTSTATUS trans2_open(struct smbsrv_request *req, struct smb_trans2 *trans trans2_setup_reply(req, trans, 30, 0, 0); - SSVAL(trans->out.params.data, VWV(0), io->t2open.file.fnum); + SSVAL(trans->out.params.data, VWV(0), io->t2open.out.file.fnum); SSVAL(trans->out.params.data, VWV(1), io->t2open.out.attrib); srv_push_dos_date3(req->smb_conn, trans->out.params.data, VWV(2), io->t2open.out.write_time); @@ -769,8 +769,8 @@ static NTSTATUS trans2_qpathinfo(struct smbsrv_request *req, struct smb_trans2 * level = SVAL(trans->in.params.data, 0); - trans2_pull_blob_string(req, &trans->in.params, 6, &st.generic.file.path, 0); - if (st.generic.file.path == NULL) { + trans2_pull_blob_string(req, &trans->in.params, 6, &st.generic.in.file.path, 0); + if (st.generic.in.file.path == NULL) { return NT_STATUS_FOOBAR; } @@ -816,7 +816,7 @@ static NTSTATUS trans2_qfileinfo(struct smbsrv_request *req, struct smb_trans2 * return NT_STATUS_FOOBAR; } - st.generic.file.fnum = SVAL(trans->in.params.data, 0); + st.generic.in.file.fnum = SVAL(trans->in.params.data, 0); level = SVAL(trans->in.params.data, 2); /* work out the backend level - we make it 1-1 in the header */ @@ -963,7 +963,7 @@ static NTSTATUS trans2_setfileinfo(struct smbsrv_request *req, struct smb_trans2 blob = &trans->in.data; - st.generic.file.fnum = fnum; + st.generic.in.file.fnum = fnum; st.generic.level = (enum smb_setfileinfo_level)level; status = trans2_parse_sfileinfo(req, &st, blob); @@ -1000,8 +1000,8 @@ static NTSTATUS trans2_setpathinfo(struct smbsrv_request *req, struct smb_trans2 blob = &trans->in.data; st.generic.level = (enum smb_setfileinfo_level)level; - trans2_pull_blob_string(req, &trans->in.params, 6, &st.generic.file.path, 0); - if (st.generic.file.path == NULL) { + trans2_pull_blob_string(req, &trans->in.params, 6, &st.generic.in.file.path, 0); + if (st.generic.in.file.path == NULL) { return NT_STATUS_FOOBAR; } |