[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2038-g7f09736

[Stefan Metzmacher]

The branch, master has been updated
       via  7f097368ed3c65467add701f1b3eb99081769ddb (commit)
       via  e545b253d805028dbe3fe2bd94189ef3b0520885 (commit)
       via  427235eb0e2559c07189713e44828e24e3f45bf8 (commit)
      from  5e67aa92f6f715a4375d769ca1b24145cf6d41bb (commit)

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


- Log -----------------------------------------------------------------
commit 7f097368ed3c65467add701f1b3eb99081769ddb
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 4 12:17:37 2009 +0200

    s3:smbd: ignore NTCREATEX_OPTIONS_SYNC_ALERT and NTCREATEX_OPTIONS_ASYNC_ALERT for SMB2 Create
    
    This should make the Windows Explorer happier.
    
    metze

commit e545b253d805028dbe3fe2bd94189ef3b0520885
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 4 12:17:01 2009 +0200

    s3:smbd: call set_current_service() when a SMB2 tcon will be used
    
    metze

commit 427235eb0e2559c07189713e44828e24e3f45bf8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 4 12:46:30 2009 +0200

    s3:smbd: fix potential fsp leak if print_fsp_open() fails
    
    metze

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

Summary of changes:
 source3/smbd/reply.c       |    1 +
 source3/smbd/smb2_create.c |    4 ++++
 source3/smbd/smb2_tcon.c   |    5 +++++
 3 files changed, 10 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 0c0d647..70d5537 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4953,6 +4953,7 @@ void reply_printopen(struct smb_request *req)
 	status = print_fsp_open(req, conn, NULL, req->vuid, fsp, &sbuf);
 
 	if (!NT_STATUS_IS_OK(status)) {
+		file_free(req, fsp);
 		reply_nterror(req, status);
 		END_PROFILE(SMBsplopen);
 		return;
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 8cd0c3b..0f955a4 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -231,6 +231,10 @@ static NTSTATUS smbd_smb2_create(struct smbd_smb2_request *req,
 		break;
 	}
 
+	/* these are ignored for SMB2 */
+	in_create_options &= ~(0x10);/* NTCREATEX_OPTIONS_SYNC_ALERT */
+	in_create_options &= ~(0x20);/* NTCREATEX_OPTIONS_ASYNC_ALERT */
+
 	status = SMB_VFS_CREATE_FILE(req->tcon->compat_conn,
 				     smbreq,
 				     0, /* root_dir_fid */
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index d99c218..8c4b1f1 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -236,6 +236,11 @@ NTSTATUS smbd_smb2_request_check_tcon(struct smbd_smb2_request *req)
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
+	/* should we pass FLAG_CASELESS_PATHNAMES here? */
+	if (!set_current_service(tcon->compat_conn, 0, true)) {
+		return NT_STATUS_ACCESS_DENIED;
+	}
+
 	req->tcon = tcon;
 	return NT_STATUS_OK;
 }


-- 
Samba Shared Repository