[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  dd2fad0... SMB2 correctness fix. As we've already returned the credits in an interim response, don't add more in the final return.
       via  c705c35... Fix warning messages about unused result of talloc_move. We're really talloc_steal'ing here.
      from  5ad12f7... s4:Descriptor tests clean-up.

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


- Log -----------------------------------------------------------------
commit dd2fad01fd50f2617bd8ee43e1329e6c0f942e54
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jun 14 16:58:15 2010 -0700

    SMB2 correctness fix. As we've already returned the credits in an interim
    response, don't add more in the final return.
    
    Jeremy.

commit c705c35076fa7a200d0156199d68870e73d1f30b
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jun 14 15:55:19 2010 -0700

    Fix warning messages about unused result of talloc_move. We're really talloc_steal'ing here.

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

Summary of changes:
 libcli/named_pipe_auth/npa_tstream.c |    6 +++---
 source3/smbd/smb2_server.c           |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/named_pipe_auth/npa_tstream.c b/libcli/named_pipe_auth/npa_tstream.c
index c96e30f..273c412 100644
--- a/libcli/named_pipe_auth/npa_tstream.c
+++ b/libcli/named_pipe_auth/npa_tstream.c
@@ -1324,7 +1324,7 @@ static void tstream_npa_accept_existing_reply(struct tevent_req *subreq)
 			DEBUG(0, ("Out of memory!\n"));
 			goto reply;
 		}
-		talloc_move(state->info3, &pipe_request);
+		talloc_steal(state->info3, pipe_request);
 
 		/* we need to force byte mode in this level */
 		state->file_type = FILE_TYPE_BYTE_MODE_PIPE;
@@ -1531,9 +1531,9 @@ int _tstream_npa_accept_existing_recv(struct tevent_req *req,
 	*server_name = talloc_move(mem_ctx, &state->server_name);
 	*info3 = talloc_move(mem_ctx, &state->info3);
 	*session_key = state->session_key;
-	talloc_move(mem_ctx, &state->session_key.data);
+	talloc_steal(mem_ctx, state->session_key.data);
 	*delegated_creds = state->delegated_creds;
-	talloc_move(mem_ctx, &state->delegated_creds.data);
+	talloc_steal(mem_ctx, state->delegated_creds.data);
 
 	tevent_req_received(req);
 	return 0;
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index a8104a1..c977653 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -876,6 +876,8 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
 	reqhdr = (uint8_t *)req->out.vector[1].iov_base;
 	SIVAL(reqhdr, SMB2_HDR_FLAGS, flags | SMB2_HDR_FLAG_ASYNC);
 	SBVAL(reqhdr, SMB2_HDR_PID, async_id);
+	/* Only return credits on the interim response. */
+	SSVAL(reqhdr, SMB2_HDR_CREDIT, 0);
 
 	{
 		const uint8_t *inhdr =


-- 
Samba Shared Repository