The branch, master has been updated
via df19469 s3: On Solaris, iov_len is an int
from 4932157 upgradeprovision: avoid working with None objects ...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit df194692952cb495fe1bc68b01965ff4b9bd2843
Author: Volker Lendecke <v...@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 4d34bcf..40009c8 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2688,6 +2688,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;
@@ -2730,7 +2731,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)) {
@@ -2738,6 +2739,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
