[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  21ec116... libcli/named_pipe_auth: we need to hide length of the message mode header from the caller
      from  6129aa0... s4:web_server: use tsocket_address functions to get the local ip and port

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


- Log -----------------------------------------------------------------
commit 21ec116bbf51b76f17b9e4054969ef315f5e2dd0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Apr 28 10:43:19 2010 +0200

    libcli/named_pipe_auth: we need to hide length of the message mode header from the caller
    
    metze

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

Summary of changes:
 libcli/named_pipe_auth/npa_tstream.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 1c9ab8f..b41fa3e 100644
--- a/libcli/named_pipe_auth/npa_tstream.c
+++ b/libcli/named_pipe_auth/npa_tstream.c
@@ -743,7 +743,7 @@ static int tstream_npa_readv_next_vector(struct tstream_context *unix_stream,
 
 	if (left > 0) {
 		/*
-		 * if the message if longer than the buffers the caller
+		 * if the message is longer than the buffers the caller
 		 * requested, we need to consume the rest of the message
 		 * into the pending buffer, where the next readv can
 		 * be served from.
@@ -808,6 +808,7 @@ struct tstream_npa_writev_state {
 	size_t count;
 
 	/* the header for message mode */
+	bool hdr_used;
 	uint8_t hdr[2];
 
 	int ret;
@@ -844,6 +845,7 @@ static struct tevent_req *tstream_npa_writev_send(TALLOC_CTX *mem_ctx,
 
 	switch (npas->file_type) {
 	case FILE_TYPE_BYTE_MODE_PIPE:
+		state->hdr_used	= false;
 		state->vector	= vector;
 		state->count	= count;
 		break;
@@ -861,6 +863,7 @@ static struct tevent_req *tstream_npa_writev_send(TALLOC_CTX *mem_ctx,
 		new_vector[0].iov_len = sizeof(state->hdr);
 		memcpy(new_vector + 1, vector, sizeof(struct iovec)*count);
 
+		state->hdr_used	= true;
 		state->vector	= new_vector;
 		state->count	= count + 1;
 
@@ -911,6 +914,14 @@ static void tstream_npa_writev_handler(struct tevent_req *subreq)
 		return;
 	}
 
+	/*
+	 * in message mode we need to hide the length
+	 * of the hdr from the caller
+	 */
+	if (state->hdr_used) {
+		ret -= sizeof(state->hdr);
+	}
+
 	state->ret = ret;
 
 	tevent_req_done(req);


-- 
Samba Shared Repository