From 35e394684d9e505e2e0c8d1b4f5c7423376cbe5a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 17 Feb 2010 13:53:02 +0100 Subject: [PATCH] tsocket/bsd: fix bug #7115 FreeBSD includes the UDP header in FIONREAD metze (cherry picked from commit d07cd37b993d3c9beded20323174633b806196b5) --- lib/tsocket/tsocket_bsd.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c index 634deb8..8080d41 100644 --- a/lib/tsocket/tsocket_bsd.c +++ b/lib/tsocket/tsocket_bsd.c @@ -877,10 +877,12 @@ static void tdgram_bsd_recvfrom_handler(void *private_data) return; } - if (ret != state->len) { - tevent_req_error(req, EIO); - return; - } + /* + * some systems too much bytes in tsocket_bsd_pending() + * the return value includes some IP/UDP header bytes + */ + state->len = ret; + talloc_realloc(state, state->buf, uint8_t, ret); tevent_req_done(req); } -- 1.6.3.3