diff options
author | Stefan Metzmacher <metze@samba.org> | 2006-03-10 20:49:20 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:56:57 -0500 |
commit | 307e43bb5628e8b53a930c2928279af994281ba5 (patch) | |
tree | 68fa41cf4e697ae94b23cedab5eb7013932fc88d /source4/torture/torture_util.c | |
parent | 2b3767b1fe7744f0412531e1522e1d5af5dc39c6 (diff) | |
download | samba-307e43bb5628e8b53a930c2928279af994281ba5.tar.gz samba-307e43bb5628e8b53a930c2928279af994281ba5.tar.bz2 samba-307e43bb5628e8b53a930c2928279af994281ba5.zip |
r14173: change smb interface structures to always use
a union smb_file, to abtract
- const char *path fot qpathinfo and setpathinfo
- uint16_t fnum for SMB
- smb2_handle handle for SMB2
the idea is to later add a struct ntvfs_handle *ntvfs
so that the ntvfs subsystem don't need to know the difference between SMB and SMB2
metze
(This used to be commit 2ef3f5970901b5accdb50f0d0115b5d46b0c788f)
Diffstat (limited to 'source4/torture/torture_util.c')
-rw-r--r-- | source4/torture/torture_util.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c index fefbfcf568..bf227f4e9f 100644 --- a/source4/torture/torture_util.c +++ b/source4/torture/torture_util.c @@ -67,7 +67,7 @@ NTSTATUS create_directory_handle(struct smbcli_tree *tree, const char *dname, in talloc_free(mem_ctx); if (NT_STATUS_IS_OK(status)) { - *fnum = io.ntcreatex.out.fnum; + *fnum = io.ntcreatex.file.fnum; } return status; @@ -134,7 +134,7 @@ int create_complex_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const cha /* make sure all the timestamps aren't the same */ fileinfo.generic.level = RAW_FILEINFO_GETATTRE; - fileinfo.generic.in.fnum = fnum; + fileinfo.generic.file.fnum = fnum; status = smb_raw_fileinfo(cli->tree, mem_ctx, &fileinfo); if (!NT_STATUS_IS_OK(status)) { @@ -211,7 +211,7 @@ int create_complex_dir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char /* make sure all the timestamps aren't the same */ fileinfo.generic.level = RAW_FILEINFO_GETATTRE; - fileinfo.generic.in.fnum = fnum; + fileinfo.generic.file.fnum = fnum; status = smb_raw_fileinfo(cli->tree, mem_ctx, &fileinfo); if (!NT_STATUS_IS_OK(status)) { @@ -337,7 +337,7 @@ void torture_all_info(struct smbcli_tree *tree, const char *fname) NTSTATUS status; finfo.generic.level = RAW_FILEINFO_ALL_INFO; - finfo.generic.in.fname = fname; + finfo.generic.file.path = fname; status = smb_raw_pathinfo(tree, mem_ctx, &finfo); if (!NT_STATUS_IS_OK(status)) { d_printf("%s - %s\n", fname, nt_errstr(status)); @@ -379,7 +379,7 @@ BOOL torture_set_file_attribute(struct smbcli_tree *tree, const char *fname, uin NTSTATUS status; sfinfo.generic.level = RAW_SFILEINFO_BASIC_INFORMATION; - sfinfo.generic.file.fname = fname; + sfinfo.generic.file.path = fname; ZERO_STRUCT(sfinfo.basic_info.in); sfinfo.basic_info.in.attrib = attrib; @@ -404,7 +404,7 @@ NTSTATUS torture_set_sparse(struct smbcli_tree *tree, int fnum) nt.ntioctl.level = RAW_IOCTL_NTIOCTL; nt.ntioctl.in.function = 0x900c4; - nt.ntioctl.in.fnum = fnum; + nt.ntioctl.file.fnum = fnum; nt.ntioctl.in.fsctl = True; nt.ntioctl.in.filter = 0; @@ -427,7 +427,7 @@ NTSTATUS torture_check_ea(struct smbcli_state *cli, TALLOC_CTX *mem_ctx = talloc_new(cli); info.ea_list.level = RAW_FILEINFO_EA_LIST; - info.ea_list.file.fname = fname; + info.ea_list.file.path = fname; info.ea_list.in.num_names = 1; info.ea_list.in.ea_names = &ea; |