[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  dd7313a Use corrcet function instead of cut-and-paste code.
       via  0a7f1af Fix leak in error path.
      from  1d27f0b mit-samba: Allow nesting on the event context

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


- Log -----------------------------------------------------------------
commit dd7313a1307aa2b3e7d10678a2bce6690e1c2125
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Feb 7 17:34:22 2011 -0800

    Use corrcet function instead of cut-and-paste code.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Tue Feb  8 03:23:40 CET 2011 on sn-devel-104

commit 0a7f1af82ca94a9ea3f2fbe6b4bf64ff17c76cce
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Feb 7 17:33:26 2011 -0800

    Fix leak in error path.

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

Summary of changes:
 source3/smbd/open.c  |    1 +
 source3/smbd/reply.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 0ef2b3a..e6a70bc 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2720,6 +2720,7 @@ static NTSTATUS open_directory(connection_struct *conn,
 	fsp->posix_open = (file_attributes & FILE_FLAG_POSIX_SEMANTICS) ? True : False;
 	status = fsp_set_smb_fname(fsp, smb_dname);
 	if (!NT_STATUS_IS_OK(status)) {
+		file_free(req, fsp);
 		return status;
 	}
 
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f7265e0..e64627b 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4821,7 +4821,7 @@ void reply_close(struct smb_request *req)
 	 * We can only use check_fsp if we know it's not a directory.
 	 */
 
-	if(!fsp || (fsp->conn != conn) || (fsp->vuid != req->vuid)) {
+	if (!check_fsp_open(conn, req, fsp)) {
 		reply_nterror(req, NT_STATUS_INVALID_HANDLE);
 		END_PROFILE(SMBclose);
 		return;


-- 
Samba Shared Repository