From a1b295ed4823ce8d06f830b8db9a5d965c934b54 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 12 Mar 2006 22:48:25 +0000 Subject: 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) --- source4/torture/raw/search.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/torture/raw/search.c') diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index b601281bb8..3707287c12 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -187,7 +187,7 @@ static BOOL test_one_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) /* get the all_info file into to check against */ all_info.generic.level = RAW_FILEINFO_ALL_INFO; - all_info.generic.file.path = fname; + all_info.generic.in.file.path = fname; status = smb_raw_pathinfo(cli->tree, mem_ctx, &all_info); if (!NT_STATUS_IS_OK(status)) { printf("RAW_FILEINFO_ALL_INFO failed - %s\n", nt_errstr(status)); @@ -196,7 +196,7 @@ static BOOL test_one_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) } alt_info.generic.level = RAW_FILEINFO_ALT_NAME_INFO; - alt_info.generic.file.path = fname; + alt_info.generic.in.file.path = fname; status = smb_raw_pathinfo(cli->tree, mem_ctx, &alt_info); if (!NT_STATUS_IS_OK(status)) { printf("RAW_FILEINFO_ALT_NAME_INFO failed - %s\n", nt_errstr(status)); @@ -205,7 +205,7 @@ static BOOL test_one_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) } internal_info.generic.level = RAW_FILEINFO_INTERNAL_INFORMATION; - internal_info.generic.file.path = fname; + internal_info.generic.in.file.path = fname; status = smb_raw_pathinfo(cli->tree, mem_ctx, &internal_info); if (!NT_STATUS_IS_OK(status)) { printf("RAW_FILEINFO_INTERNAL_INFORMATION failed - %s\n", nt_errstr(status)); @@ -214,7 +214,7 @@ static BOOL test_one_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) } name_info.generic.level = RAW_FILEINFO_NAME_INFO; - name_info.generic.file.path = fname; + name_info.generic.in.file.path = fname; status = smb_raw_pathinfo(cli->tree, mem_ctx, &name_info); if (!NT_STATUS_IS_OK(status)) { printf("RAW_FILEINFO_NAME_INFO failed - %s\n", nt_errstr(status)); @@ -813,7 +813,7 @@ static BOOL test_modify_search(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) torture_set_file_attribute(cli->tree, BASEDIR "\\T017-17.txt", FILE_ATTRIBUTE_SYSTEM); torture_set_file_attribute(cli->tree, BASEDIR "\\T018-18.txt", 0); sfinfo.generic.level = RAW_SFILEINFO_DISPOSITION_INFORMATION; - sfinfo.generic.file.fnum = fnum; + sfinfo.generic.in.file.fnum = fnum; sfinfo.disposition_info.in.delete_on_close = 1; status = smb_raw_setfileinfo(cli->tree, &sfinfo); CHECK_STATUS(status, NT_STATUS_OK); @@ -1219,7 +1219,7 @@ static BOOL test_ea_list(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) smbcli_close(cli->tree, fnum); setfile.generic.level = RAW_SFILEINFO_EA_SET; - setfile.generic.file.path = BASEDIR "\\file2.txt"; + setfile.generic.in.file.path = BASEDIR "\\file2.txt"; setfile.ea_set.in.num_eas = 2; setfile.ea_set.in.eas = talloc_array(mem_ctx, struct ea_struct, 2); setfile.ea_set.in.eas[0].flags = 0; @@ -1232,7 +1232,7 @@ static BOOL test_ea_list(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) status = smb_raw_setpathinfo(cli->tree, &setfile); CHECK_STATUS(status, NT_STATUS_OK); - setfile.generic.file.path = BASEDIR "\\file3.txt"; + setfile.generic.in.file.path = BASEDIR "\\file3.txt"; status = smb_raw_setpathinfo(cli->tree, &setfile); CHECK_STATUS(status, NT_STATUS_OK); -- cgit