[SCM] Samba Shared Repository - branch v3-6-test updated

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  84baef5 s3: On Solaris, iov_len is an int
      from  a7a907c Fix warning message on SAFE_FREE.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 84baef55cd486e72226211456e23636aa3de45da
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Sep 5 16:27:43 2010 +0200

    s3: On Solaris, iov_len is an int
    
    We can't use &iov.iov_len passing it to a size_t *

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

Summary of changes:
 source3/smbd/process.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 711bbf4..a812758 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2663,6 +2663,7 @@ static void smbd_echo_reader(struct tevent_context *ev,
 	size_t unread, num_pending;
 	NTSTATUS status;
 	struct iovec *tmp;
+	size_t iov_len;
 	uint32_t seqnum = 0;
 	bool reply;
 	bool ok;
@@ -2705,7 +2706,7 @@ static void smbd_echo_reader(struct tevent_context *ev,
 				    0 /* timeout */,
 				    &unread,
 				    &encrypted,
-				    &state->pending[num_pending].iov_len,
+				    &iov_len,
 				    &seqnum,
 				    false /* trusted_channel*/);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -2713,6 +2714,7 @@ static void smbd_echo_reader(struct tevent_context *ev,
 			  (int)sys_getpid(), nt_errstr(status)));
 		exit(1);
 	}
+	state->pending[num_pending].iov_len = iov_len;
 
 	ok = smbd_unlock_socket_internal(sconn);
 	if (!ok) {


-- 
Samba Shared Repository