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/basic/delaywrite.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'source4/torture/basic/delaywrite.c') diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 2a41508bcc..37a9528f97 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -54,7 +54,7 @@ static BOOL test_delayed_write_update(struct smbcli_state *cli, TALLOC_CTX *mem_ } finfo1.basic_info.level = RAW_FILEINFO_BASIC_INFO; - finfo1.basic_info.file.fnum = fnum1; + finfo1.basic_info.in.file.fnum = fnum1; finfo2 = finfo1; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo1); @@ -148,7 +148,7 @@ static BOOL test_delayed_write_update2(struct smbcli_state *cli, TALLOC_CTX *mem } finfo1.basic_info.level = RAW_FILEINFO_BASIC_INFO; - finfo1.basic_info.file.fnum = fnum1; + finfo1.basic_info.in.file.fnum = fnum1; finfo2 = finfo1; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo1); @@ -170,7 +170,7 @@ static BOOL test_delayed_write_update2(struct smbcli_state *cli, TALLOC_CTX *mem union smb_setfileinfo sfinfo; time_t t_set = time(NULL); sfinfo.basic_info.level = RAW_SFILEINFO_BASIC_INFO; - sfinfo.basic_info.file.fnum = fnum1; + sfinfo.basic_info.in.file.fnum = fnum1; sfinfo.basic_info.in.create_time = finfo1.basic_info.out.create_time; sfinfo.basic_info.in.access_time = finfo1.basic_info.out.access_time; @@ -195,7 +195,7 @@ static BOOL test_delayed_write_update2(struct smbcli_state *cli, TALLOC_CTX *mem t = time(NULL); while (time(NULL) < t+120) { - finfo2.basic_info.file.path = fname; + finfo2.basic_info.in.file.path = fname; status = smb_raw_pathinfo(cli2->tree, mem_ctx, &finfo2); @@ -223,7 +223,7 @@ static BOOL test_delayed_write_update2(struct smbcli_state *cli, TALLOC_CTX *mem /* Now try a write to see if the write time gets reset. */ finfo1.basic_info.level = RAW_FILEINFO_BASIC_INFO; - finfo1.basic_info.file.fnum = fnum1; + finfo1.basic_info.in.file.fnum = fnum1; finfo2 = finfo1; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo1); @@ -252,7 +252,7 @@ static BOOL test_delayed_write_update2(struct smbcli_state *cli, TALLOC_CTX *mem printf("Doing flush after write\n"); - flsh.flush.file.fnum = fnum1; + flsh.flush.in.file.fnum = fnum1; status = smb_raw_flush(cli->tree, &flsh); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("smbflush failed: %s\n", nt_errstr(status))); @@ -330,7 +330,7 @@ static BOOL test_delayed_write_update2(struct smbcli_state *cli, TALLOC_CTX *mem } finfo1.basic_info.level = RAW_FILEINFO_BASIC_INFO; - finfo1.basic_info.file.fnum = fnum2; + finfo1.basic_info.in.file.fnum = fnum2; finfo2 = finfo1; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo2); @@ -384,7 +384,7 @@ static BOOL test_delayed_write_update2(struct smbcli_state *cli, TALLOC_CTX *mem } finfo1.basic_info.level = RAW_FILEINFO_BASIC_INFO; - finfo1.basic_info.file.fnum = fnum1; + finfo1.basic_info.in.file.fnum = fnum1; finfo2 = finfo1; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo1); @@ -409,7 +409,7 @@ static BOOL test_delayed_write_update2(struct smbcli_state *cli, TALLOC_CTX *mem } finfo1.basic_info.level = RAW_FILEINFO_BASIC_INFO; - finfo1.basic_info.file.fnum = fnum1; + finfo1.basic_info.in.file.fnum = fnum1; finfo2 = finfo1; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo2); @@ -502,7 +502,7 @@ static BOOL test_finfo_after_write(struct smbcli_state *cli, TALLOC_CTX *mem_ctx } finfo1.basic_info.level = RAW_FILEINFO_BASIC_INFO; - finfo1.basic_info.file.fnum = fnum1; + finfo1.basic_info.in.file.fnum = fnum1; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo1); @@ -545,7 +545,7 @@ static BOOL test_finfo_after_write(struct smbcli_state *cli, TALLOC_CTX *mem_ctx } finfo2.basic_info.level = RAW_FILEINFO_BASIC_INFO; - finfo2.basic_info.file.path = fname; + finfo2.basic_info.in.file.path = fname; status = smb_raw_pathinfo(cli2->tree, mem_ctx, &finfo2); @@ -598,7 +598,7 @@ static BOOL test_finfo_after_write(struct smbcli_state *cli, TALLOC_CTX *mem_ctx /* This call is only for the people looking at ethereal :-) */ finfo2.basic_info.level = RAW_FILEINFO_BASIC_INFO; - finfo2.basic_info.file.path = fname; + finfo2.basic_info.in.file.path = fname; status = smb_raw_pathinfo(cli->tree, mem_ctx, &finfo2); -- cgit