[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  7c96e96 s3:smb2_server: there's no reason to check the session id twice on a smb2_tcon request
       via  601b138 s3:smb2_create: call 'return' after smbd_server_connection_terminate()
      from  e17ab20 s3-build add tevent depencency on libsmb

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


- Log -----------------------------------------------------------------
commit 7c96e96e9881ec1ad7b41f0ab241a5b0ac17b93f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jul 4 15:57:20 2011 +0200

    s3:smb2_server: there's no reason to check the session id twice on a smb2_tcon request
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Jul  4 17:34:13 CEST 2011 on sn-devel-104

commit 601b138e92e38cdafb1763c475a3d6dfac70a5a6
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jul 4 15:50:56 2011 +0200

    s3:smb2_create: call 'return' after smbd_server_connection_terminate()
    
    This is not strictly needed in the fork process model, but we hopefully
    support other models in future.
    
    metze

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 73b8ade..2360286 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -1076,6 +1076,7 @@ void schedule_deferred_open_message_smb2(
 	if (!state->im) {
 		smbd_server_connection_terminate(smb2req->sconn,
 			nt_errstr(NT_STATUS_NO_MEMORY));
+		return;
 	}
 
 	DEBUG(10,("schedule_deferred_open_message_smb2: "
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 49e748b..1bbb108 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1172,11 +1172,6 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req)
 			return_value = smbd_smb2_request_error(req, session_status);
 			break;
 		}
-		status = smbd_smb2_request_check_session(req);
-		if (!NT_STATUS_IS_OK(status)) {
-			return_value = smbd_smb2_request_error(req, status);
-			break;
-		}
 
 		{
 			START_PROFILE(smb2_tcon);


-- 
Samba Shared Repository