r14173: change smb interface structures to always use

[ira/wip.git] / source / torture / torture_util.c

diff --git a/source/torture/torture_util.c b/source/torture/torture_util.c
index 4606ec68407fba2022b95c9d42ebcf72473016e3..bf227f4e9fe185796f148fb991c98ef48a9226d0 100644 (file)
--- a/source/torture/torture_util.c
+++ b/source/torture/torture_util.c
@@ -20,9 +20,9 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 #include "system/shmem.h"
 #include "system/time.h"
-#include "librpc/gen_ndr/ndr_security.h"
 
 
 /*
@@ -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)) {
@@ -318,8 +318,8 @@ void dump_all_info(TALLOC_CTX *mem_ctx, union smb_fileinfo *finfo)
        d_printf("\twrite_time:     %s\n", nt_time_string(mem_ctx, finfo->all_info.out.write_time));
        d_printf("\tchange_time:    %s\n", nt_time_string(mem_ctx, finfo->all_info.out.change_time));
        d_printf("\tattrib:         0x%x\n", finfo->all_info.out.attrib);
-       d_printf("\talloc_size:     %llu\n", (uint64_t)finfo->all_info.out.alloc_size);
-       d_printf("\tsize:           %llu\n", (uint64_t)finfo->all_info.out.size);
+       d_printf("\talloc_size:     %llu\n", (long long)finfo->all_info.out.alloc_size);
+       d_printf("\tsize:           %llu\n", (long long)finfo->all_info.out.size);
        d_printf("\tnlink:          %u\n", finfo->all_info.out.nlink);
        d_printf("\tdelete_pending: %u\n", finfo->all_info.out.delete_pending);
        d_printf("\tdirectory:      %u\n", finfo->all_info.out.directory);
@@ -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;