summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorFrank Lahm <franklahm@googlemail.com>2011-10-13 15:41:53 -0700
committerJeremy Allison <jra@samba.org>2011-10-14 03:26:06 +0200
commit7a0b5d6fc51d5d212529e82e5ed8e21516bfbe27 (patch)
treefad7ac26c5589be626395bd9fd710b3440fd5f54 /source3/smbd
parent1b27efd9107eef290e2c7d4826953157bab2f3c4 (diff)
downloadsamba-7a0b5d6fc51d5d212529e82e5ed8e21516bfbe27.tar.gz
samba-7a0b5d6fc51d5d212529e82e5ed8e21516bfbe27.tar.bz2
samba-7a0b5d6fc51d5d212529e82e5ed8e21516bfbe27.zip
Add support for VFS op streaminfo chaining in all relevant VFS modules.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Fri Oct 14 03:26:06 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/close.c4
-rw-r--r--source3/smbd/filename.c2
-rw-r--r--source3/smbd/nttrans.c4
-rw-r--r--source3/smbd/open.c6
-rw-r--r--source3/smbd/trans2.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index a1b6fd8f25..33e497c598 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -206,9 +206,9 @@ static void notify_deferred_opens(struct messaging_context *msg_ctx,
NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
{
- struct stream_struct *stream_info;
+ struct stream_struct *stream_info = NULL;
int i;
- unsigned int num_streams;
+ unsigned int num_streams = 0;
TALLOC_CTX *frame = talloc_stackframe();
NTSTATUS status;
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 610a4ce42a..7fe7cc8063 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1169,7 +1169,7 @@ static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
struct smb_filename *smb_fname)
{
NTSTATUS status;
- unsigned int i, num_streams;
+ unsigned int i, num_streams = 0;
struct stream_struct *streams = NULL;
if (SMB_VFS_STAT(conn, smb_fname) == 0) {
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index c69aa6ae2f..2d6fa264cc 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -693,7 +693,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
if (flags & EXTENDED_RESPONSE_REQUIRED) {
uint16_t file_status = (NO_EAS|NO_SUBSTREAMS|NO_REPARSETAG);
size_t num_names = 0;
- unsigned int num_streams;
+ unsigned int num_streams = 0;
struct stream_struct *streams = NULL;
/* Do we have any EA's ? */
@@ -1274,7 +1274,7 @@ static void call_nt_transact_create(connection_struct *conn,
if (flags & EXTENDED_RESPONSE_REQUIRED) {
uint16_t file_status = (NO_EAS|NO_SUBSTREAMS|NO_REPARSETAG);
size_t num_names = 0;
- unsigned int num_streams;
+ unsigned int num_streams = 0;
struct stream_struct *streams = NULL;
/* Do we have any EA's ? */
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a44f15f0cc..b897c8aa25 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2965,10 +2965,10 @@ void msg_file_was_renamed(struct messaging_context *msg,
NTSTATUS open_streams_for_delete(connection_struct *conn,
const char *fname)
{
- struct stream_struct *stream_info;
- files_struct **streams;
+ struct stream_struct *stream_info = NULL;
+ files_struct **streams = NULL;
int i;
- unsigned int num_streams;
+ unsigned int num_streams = 0;
TALLOC_CTX *frame = talloc_stackframe();
NTSTATUS status;
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index fbb4504760..6ef7156c8e 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -4671,8 +4671,8 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
*/
case SMB_QUERY_FILE_STREAM_INFO:
case SMB_FILE_STREAM_INFORMATION: {
- unsigned int num_streams;
- struct stream_struct *streams;
+ unsigned int num_streams = 0;
+ struct stream_struct *streams = NULL;
DEBUG(10,("smbd_do_qfilepathinfo: "
"SMB_FILE_STREAM_INFORMATION\n"));