summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-13 12:43:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:11 -0500
commit03bd05947bb700abc444be84b3da857a6a8d2c6d (patch)
tree6af11509346a23e402248cb8f11dc560bae38b05 /source4
parentca7f7a4615a09979113a86135dca1254bd90657a (diff)
downloadsamba-03bd05947bb700abc444be84b3da857a6a8d2c6d.tar.gz
samba-03bd05947bb700abc444be84b3da857a6a8d2c6d.tar.bz2
samba-03bd05947bb700abc444be84b3da857a6a8d2c6d.zip
r14316: don't zero the smb_handle after it was set:-)
metze (This used to be commit 74472ed8be2d206c2f9db030252d6defe9d6016e)
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/raw/open.c4
-rw-r--r--source4/torture/torture_util.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 17afe4b4e0..420580847e 100644
--- 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 e66fcde758..cecb005504 100644
--- 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);