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/basic/denytest.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/basic/denytest.c')
-rw-r--r-- | source4/torture/basic/denytest.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c index 2e68efa4eb..646714a4e9 100644 --- a/source4/torture/basic/denytest.c +++ b/source4/torture/basic/denytest.c @@ -1847,20 +1847,20 @@ static BOOL torture_ntdenytest(struct smbcli_state *cli1, struct smbcli_state *c } else { res = A_0; if (smbcli_read(cli2->tree, - io2.ntcreatex.out.fnum, buf, 0, sizeof(buf)) >= 1) { + io2.ntcreatex.file.fnum, buf, 0, sizeof(buf)) >= 1) { res += A_R; } if (smbcli_write(cli2->tree, - io2.ntcreatex.out.fnum, 0, buf, 0, sizeof(buf)) >= 1) { + io2.ntcreatex.file.fnum, 0, buf, 0, sizeof(buf)) >= 1) { res += A_W; } } if (NT_STATUS_IS_OK(status1)) { - smbcli_close(cli1->tree, io1.ntcreatex.out.fnum); + smbcli_close(cli1->tree, io1.ntcreatex.file.fnum); } if (NT_STATUS_IS_OK(status2)) { - smbcli_close(cli2->tree, io2.ntcreatex.out.fnum); + smbcli_close(cli2->tree, io2.ntcreatex.file.fnum); } status2_p = predict_share_conflict(io1.ntcreatex.in.share_access, @@ -2000,11 +2000,11 @@ BOOL torture_denydos_sharing(void) printf("openx twice with RDWR/DENY_DOS\n"); status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum1 = io.openx.out.fnum; + fnum1 = io.openx.file.fnum; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.openx.out.fnum; + fnum2 = io.openx.file.fnum; printf("fnum1=%d fnum2=%d\n", fnum1, fnum2); @@ -2016,12 +2016,12 @@ BOOL torture_denydos_sharing(void) printf("two handles should be same file handle\n"); finfo.position_information.level = RAW_FILEINFO_POSITION_INFORMATION; - finfo.position_information.in.fnum = fnum1; + finfo.position_information.file.fnum = fnum1; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo); CHECK_STATUS(status, NT_STATUS_OK); CHECK_VAL(finfo.position_information.out.position, 1000); - finfo.position_information.in.fnum = fnum2; + finfo.position_information.file.fnum = fnum2; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo); CHECK_STATUS(status, NT_STATUS_OK); CHECK_VAL(finfo.position_information.out.position, 1000); @@ -2034,12 +2034,12 @@ BOOL torture_denydos_sharing(void) io.openx.in.open_mode = OPENX_MODE_ACCESS_RDWR | OPENX_MODE_DENY_NONE; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum1 = io.openx.out.fnum; + fnum1 = io.openx.file.fnum; io.openx.in.open_func = OPENX_OPEN_FUNC_OPEN; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); - fnum2 = io.openx.out.fnum; + fnum2 = io.openx.file.fnum; printf("fnum1=%d fnum2=%d\n", fnum1, fnum2); @@ -2051,12 +2051,12 @@ BOOL torture_denydos_sharing(void) CHECK_STATUS(status, NT_STATUS_OK); finfo.position_information.level = RAW_FILEINFO_POSITION_INFORMATION; - finfo.position_information.in.fnum = fnum1; + finfo.position_information.file.fnum = fnum1; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo); CHECK_STATUS(status, NT_STATUS_OK); CHECK_VAL(finfo.position_information.out.position, 1000); - finfo.position_information.in.fnum = fnum2; + finfo.position_information.file.fnum = fnum2; status = smb_raw_fileinfo(cli->tree, mem_ctx, &finfo); CHECK_STATUS(status, NT_STATUS_OK); CHECK_VAL(finfo.position_information.out.position, 0); |