r14316: don't zero the smb_handle after it was set:-)

metze
(This used to be commit 74472ed8be2d206c2f9db030252d6defe9d6016e)

diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 17afe4b4e07ce5a652f0c7a18eea9ff2dc06cb89..420580847e86eaa03a033d24affb428a3e0ae8d6 100644 (file)
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -138,9 +138,9 @@ static const char *rdwr_string(enum rdwr_mode m)
 
 #define SET_ATTRIB(sattrib) do { \
        union smb_setfileinfo sfinfo; \
-       sfinfo.generic.level = RAW_SFILEINFO_BASIC_INFORMATION; \
-       sfinfo.generic.in.file.path = fname; \
        ZERO_STRUCT(sfinfo.basic_info.in); \
+       sfinfo.basic_info.level = RAW_SFILEINFO_BASIC_INFORMATION; \
+       sfinfo.basic_info.in.file.path = fname; \
        sfinfo.basic_info.in.attrib = sattrib; \
        status = smb_raw_setpathinfo(cli->tree, &sfinfo); \
        if (!NT_STATUS_IS_OK(status)) { \

diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index e66fcde758599972980320794724db56ee74d7b8..cecb005504f9543474674aec83f1ed76bc8fa292 100644 (file)
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -379,10 +379,9 @@ BOOL torture_set_file_attribute(struct smbcli_tree *tree, const char *fname, uin
        union smb_setfileinfo sfinfo;
        NTSTATUS status;
 
-       sfinfo.generic.level = RAW_SFILEINFO_BASIC_INFORMATION;
-       sfinfo.generic.in.file.path = fname;
-
        ZERO_STRUCT(sfinfo.basic_info.in);
+       sfinfo.basic_info.level = RAW_SFILEINFO_BASIC_INFORMATION;
+       sfinfo.basic_info.in.file.path = fname;
        sfinfo.basic_info.in.attrib = attrib;
        status = smb_raw_setpathinfo(tree, &sfinfo);
        return NT_STATUS_IS_OK(status);