[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-725-g202228d

Jeremy Allison jra at samba.org
Thu Mar 26 04:48:59 GMT 2009


The branch, master has been updated
       via  202228d48b6459148d328840d23322ecfac00626 (commit)
      from  5adeaea664b016225518a465e3fc2ed4b8cce098 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 202228d48b6459148d328840d23322ecfac00626
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Mar 25 21:48:37 2009 -0700

    Ensure we never enter VFS_CREATE without having initialized
    sbuf as invalid (if not already read via stat()). Still trying
    to find the build farm RAW-STREAM errors and it's happening
    in a openX call....
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/nttrans.c |    4 ++++
 source3/smbd/reply.c   |    6 ++++++
 source3/smbd/trans2.c  |    2 ++
 3 files changed, 12 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 628fc1b..7e75eea 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -441,6 +441,8 @@ void reply_ntcreate_and_X(struct smb_request *req)
 
 	START_PROFILE(SMBntcreateX);
 
+	SET_STAT_INVALID(sbuf);
+
 	if (req->wct < 24) {
 		reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
 		return;
@@ -865,6 +867,8 @@ static void call_nt_transact_create(connection_struct *conn,
 	uint8_t oplock_granted;
 	TALLOC_CTX *ctx = talloc_tos();
 
+	SET_STAT_INVALID(sbuf);
+
 	DEBUG(5,("call_nt_transact_create\n"));
 
 	/*
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 6f19a58..16eb4a7 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1606,6 +1606,8 @@ void reply_open(struct smb_request *req)
 
 	START_PROFILE(SMBopen);
 
+	SET_STAT_INVALID(sbuf);
+
 	if (req->wct < 2) {
 		reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
 		END_PROFILE(SMBopen);
@@ -1741,6 +1743,8 @@ void reply_open_and_X(struct smb_request *req)
 		return;
 	}
 
+	SET_STAT_INVALID(sbuf);
+
 	open_flags = SVAL(req->vwv+2, 0);
 	deny_mode = SVAL(req->vwv+3, 0);
 	smb_attr = SVAL(req->vwv+5, 0);
@@ -1945,6 +1949,7 @@ void reply_mknew(struct smb_request *req)
 
 	START_PROFILE(SMBcreate);
 	ZERO_STRUCT(ft);
+	SET_STAT_INVALID(sbuf);
 
         if (req->wct < 3) {
 		reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
@@ -2123,6 +2128,7 @@ void reply_ctemp(struct smb_request *req)
 		return;
 	}
 
+	SET_STAT_INVALID(sbuf);
 	SMB_VFS_STAT(conn,fname,&sbuf);
 
 	/* We should fail if file does not exist. */
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index df01a39..04b1145 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -895,6 +895,8 @@ static void call_trans2open(connection_struct *conn,
 	uint32 create_options = 0;
 	TALLOC_CTX *ctx = talloc_tos();
 
+	SET_STAT_INVALID(sbuf);
+
 	/*
 	 * Ensure we have enough parameters to perform the operation.
 	 */


-- 
Samba Shared Repository


More information about the samba-cvs mailing list