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/nttrans.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/nttrans.c')
| -rw-r--r-- | source4/smb_server/smb/nttrans.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c index 846cea9796..ea47d99d28 100644 --- a/source4/smb_server/smb/nttrans.c +++ b/source4/smb_server/smb/nttrans.c @@ -77,7 +77,7 @@ static NTSTATUS nttrans_create_send(struct nttrans_op *op) NT_STATUS_HAVE_NO_MEMORY(params); SSVAL(params, 0, io->ntcreatex.out.oplock_level); - SSVAL(params, 2, io->ntcreatex.file.fnum); + SSVAL(params, 2, io->ntcreatex.out.file.fnum); SIVAL(params, 4, io->ntcreatex.out.create_action); SIVAL(params, 8, 0); /* ea error offset */ push_nttime(params, 12, io->ntcreatex.out.create_time); @@ -234,7 +234,7 @@ static NTSTATUS nttrans_query_sec_desc(struct smbsrv_request *req, NT_STATUS_HAVE_NO_MEMORY(io); io->query_secdesc.level = RAW_FILEINFO_SEC_DESC; - io->query_secdesc.file.fnum = SVAL(trans->in.params.data, 0); + io->query_secdesc.in.file.fnum = SVAL(trans->in.params.data, 0); io->query_secdesc.in.secinfo_flags = IVAL(trans->in.params.data, 4); op->op_info = io; @@ -263,7 +263,7 @@ static NTSTATUS nttrans_set_sec_desc(struct smbsrv_request *req, NT_STATUS_HAVE_NO_MEMORY(io); io->set_secdesc.level = RAW_SFILEINFO_SEC_DESC; - io->set_secdesc.file.fnum = SVAL(trans->in.params.data, 0); + io->set_secdesc.in.file.fnum = SVAL(trans->in.params.data, 0); io->set_secdesc.in.secinfo_flags = IVAL(trans->in.params.data, 4); io->set_secdesc.in.sd = talloc(io, struct security_descriptor); @@ -322,7 +322,7 @@ static NTSTATUS nttrans_ioctl(struct smbsrv_request *req, blob = &trans->in.data; nt->ntioctl.level = RAW_IOCTL_NTIOCTL; - nt->ntioctl.file.fnum = fnum; + nt->ntioctl.in.file.fnum = fnum; nt->ntioctl.in.function = function; nt->ntioctl.in.fsctl = fsctl; nt->ntioctl.in.filter = filter; @@ -404,7 +404,7 @@ static NTSTATUS nttrans_notify_change(struct smbsrv_request *req, NT_STATUS_HAVE_NO_MEMORY(info); info->notify.in.completion_filter = IVAL(trans->in.setup, 0); - info->notify.file.fnum = SVAL(trans->in.setup, 4); + info->notify.in.file.fnum = SVAL(trans->in.setup, 4); info->notify.in.recursive = SVAL(trans->in.setup, 6); info->notify.in.buffer_size = trans->in.max_param; |