From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 19 Mar 2009 08:06:38 +0000 (+0100)
Subject: s3:lib/util_sock: use sys_recv() instead of sys_read() on sockets
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=0dfdb7b911ed4fe013fc4a22a8c3a28620277a67;p=metze%2Fsamba%2Fwip.git

s3:lib/util_sock: use sys_recv() instead of sys_read() on sockets

This ways the pcap support in socket wrapper sees the received data.

metze
---

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index de5b232aac7e..a0dbca1a001e 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -519,7 +519,7 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
 		}
 
 		while (nread < mincnt) {
-			readret = sys_read(fd, buf + nread, maxcnt - nread);
+			readret = sys_recv(fd, buf + nread, maxcnt - nread, 0);
 
 			if (readret == 0) {
 				DEBUG(5,("read_socket_with_timeout: "
@@ -588,7 +588,7 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
 			return NT_STATUS_IO_TIMEOUT;
 		}
 
-		readret = sys_read(fd, buf+nread, maxcnt-nread);
+		readret = sys_recv(fd, buf+nread, maxcnt-nread, 0);
 
 		if (readret == 0) {
 			/* we got EOF on the file descriptor */