summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@samba.org>2013-11-08 13:56:23 +0100
committerJeremy Allison <jra@samba.org>2013-11-08 09:40:37 -0800
commitc7aab6e5205b78f00f84492cc1a0fd4b67ef917a (patch)
tree1de06bea87972023d24c0984c45f33a67494e47f /source3
parent15b0c39befae67004a0d462601eabc5172060031 (diff)
downloadsamba-c7aab6e5205b78f00f84492cc1a0fd4b67ef917a.tar.gz
samba-c7aab6e5205b78f00f84492cc1a0fd4b67ef917a.tar.xz
samba-c7aab6e5205b78f00f84492cc1a0fd4b67ef917a.zip
vfstest: fix uninitialised variable usage in open
The vfstest open command currently fails intermittently due to a read of a potentially uninitialised status variable. Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/torture/cmd_vfs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 1b202084a9..f923ed5999 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -347,6 +347,7 @@ static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
return NT_STATUS_UNSUCCESSFUL;
}
+ status = NT_STATUS_OK;
ret = SMB_VFS_FSTAT(fsp, &smb_fname->st);
if (ret == -1) {
/* If we have an fd, this stat should succeed. */
@@ -359,7 +360,7 @@ static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
errno = EISDIR;
status = NT_STATUS_FILE_IS_A_DIRECTORY;
}
-
+
if (!NT_STATUS_IS_OK(status)) {
SMB_VFS_CLOSE(fsp);
TALLOC_FREE(fsp);
@@ -1780,7 +1781,7 @@ struct cmd_set vfs_commands[] = {
{ "mkdir", cmd_mkdir, "VFS mkdir()", "mkdir <path>" },
{ "rmdir", cmd_pathfunc, "VFS rmdir()", "rmdir <path>" },
{ "closedir", cmd_closedir, "VFS closedir()", "closedir" },
- { "open", cmd_open, "VFS open()", "open <fname>" },
+ { "open", cmd_open, "VFS open()", "open <fname> <flags> <mode>" },
{ "close", cmd_close, "VFS close()", "close <fd>" },
{ "read", cmd_read, "VFS read()", "read <fd> <size>" },
{ "write", cmd_write, "VFS write()", "write <fd> <size>" },