[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  c42d9c4... tsocket/bsd: fix comment in tdgram_bsd_recvfrom_handler()
      from  9abce9f... Revert "Got back to 16-byte padding on auth RPC. S3 clients and servers now cope with this. Jeremy"

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


- Log -----------------------------------------------------------------
commit c42d9c4ec410e205091784cd97cbceb5572609d8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Feb 17 19:11:11 2010 +0100

    tsocket/bsd: fix comment in tdgram_bsd_recvfrom_handler()
    
    metze

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

Summary of changes:
 lib/tsocket/tsocket_bsd.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 9d5a329..c44ba4e 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -884,8 +884,10 @@ static void tdgram_bsd_recvfrom_handler(void *private_data)
 	}
 
 	/*
-	 * some systems too much bytes in tsocket_bsd_pending()
-	 * the return value includes some IP/UDP header bytes
+	 * Some systems (FreeBSD, see bug #7115) return too much
+	 * bytes in tsocket_bsd_pending()/ioctl(fd, FIONREAD, ...),
+	 * the return value includes some IP/UDP header bytes,
+	 * while recvfrom() just returns the payload.
 	 */
 	state->buf = talloc_realloc(state, state->buf, uint8_t, ret);
 	if (tevent_req_nomem(state->buf, req)) {


-- 
Samba Shared Repository