summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-09-05 16:27:43 +0200
committerVolker Lendecke <vl@samba.org>2010-09-05 16:41:28 +0200
commitdf194692952cb495fe1bc68b01965ff4b9bd2843 (patch)
tree00e1b612afe5b4c2faef5f3160c1891d94500f0b
parent49321571ea592be2307eef101cc783f883aa2503 (diff)
downloadsamba-df194692952cb495fe1bc68b01965ff4b9bd2843.tar.gz
samba-df194692952cb495fe1bc68b01965ff4b9bd2843.tar.bz2
samba-df194692952cb495fe1bc68b01965ff4b9bd2843.zip
s3: On Solaris, iov_len is an int
We can't use &iov.iov_len passing it to a size_t *
-rw-r--r--source3/smbd/process.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 4d34bcf858..40009c8a3c 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) {