r14256: - rename smb_file -> smb_handle

[jelmer/samba4-debian.git] / source / torture / basic / denytest.c

diff --git a/source/torture/basic/denytest.c b/source/torture/basic/denytest.c
index 5715238fca37ef33ab87cbac0543871eec51f94a..127df9052db0056a353a8d41406018d364122872 100644 (file)
--- a/source/torture/basic/denytest.c
+++ b/source/torture/basic/denytest.c
@@ -1851,7 +1851,7 @@ static BOOL torture_ntdenytest(struct smbcli_state *cli1, struct smbcli_state *c
                        /* we can't use smbcli_read() as we need to
                           set read_for_execute */
                        r.readx.level = RAW_READ_READX;
-                       r.readx.file.fnum = io2.ntcreatex.file.fnum;
+                       r.readx.in.file.fnum = io2.ntcreatex.out.file.fnum;
                        r.readx.in.offset = 0;
                        r.readx.in.mincnt = sizeof(buf);
                        r.readx.in.maxcnt = sizeof(buf);
@@ -1864,17 +1864,17 @@ static BOOL torture_ntdenytest(struct smbcli_state *cli1, struct smbcli_state *c
                        if (NT_STATUS_IS_OK(status)) {
                                res += A_R;
                        }
-                       if (smbcli_write(cli2->tree, 
-                                        io2.ntcreatex.file.fnum, 0, buf, 0, sizeof(buf)) >= 1) {
+                       if (smbcli_write(cli2->tree, io2.ntcreatex.out.file.fnum,
+                                        0, buf, 0, sizeof(buf)) >= 1) {
                                res += A_W;
                        }
                }
                
                if (NT_STATUS_IS_OK(status1)) {
-                       smbcli_close(cli1->tree, io1.ntcreatex.file.fnum);
+                       smbcli_close(cli1->tree, io1.ntcreatex.out.file.fnum);
                }
                if (NT_STATUS_IS_OK(status2)) {
-                       smbcli_close(cli2->tree, io2.ntcreatex.file.fnum);
+                       smbcli_close(cli2->tree, io2.ntcreatex.out.file.fnum);
                }
                
                status2_p = predict_share_conflict(io1.ntcreatex.in.share_access,
@@ -2014,28 +2014,28 @@ 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.file.fnum;
+       fnum1 = io.openx.out.file.fnum;
 
        status = smb_raw_open(cli->tree, mem_ctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
-       fnum2 = io.openx.file.fnum;
+       fnum2 = io.openx.out.file.fnum;
 
        printf("fnum1=%d fnum2=%d\n", fnum1, fnum2);
 
        sfinfo.generic.level = RAW_SFILEINFO_POSITION_INFORMATION;
-       sfinfo.position_information.file.fnum = fnum1;
+       sfinfo.position_information.in.file.fnum = fnum1;
        sfinfo.position_information.in.position = 1000;
        status = smb_raw_setfileinfo(cli->tree, &sfinfo);
        CHECK_STATUS(status, NT_STATUS_OK);
 
        printf("two handles should be same file handle\n");
        finfo.position_information.level = RAW_FILEINFO_POSITION_INFORMATION;
-       finfo.position_information.file.fnum = fnum1;
+       finfo.position_information.in.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.file.fnum = fnum2;
+       finfo.position_information.in.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);
@@ -2048,29 +2048,29 @@ 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.file.fnum;
+       fnum1 = io.openx.out.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.file.fnum;
+       fnum2 = io.openx.out.file.fnum;
 
        printf("fnum1=%d fnum2=%d\n", fnum1, fnum2);
 
        printf("two handles should be separate\n");
        sfinfo.generic.level = RAW_SFILEINFO_POSITION_INFORMATION;
-       sfinfo.position_information.file.fnum = fnum1;
+       sfinfo.position_information.in.file.fnum = fnum1;
        sfinfo.position_information.in.position = 1000;
        status = smb_raw_setfileinfo(cli->tree, &sfinfo);
        CHECK_STATUS(status, NT_STATUS_OK);
 
        finfo.position_information.level = RAW_FILEINFO_POSITION_INFORMATION;
-       finfo.position_information.file.fnum = fnum1;
+       finfo.position_information.in.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.file.fnum = fnum2;
+       finfo.position_information.in.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);