git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2d1fcdc
)
s3:lib/util_sock: use sys_recv() instead of sys_read() on sockets
author
Stefan Metzmacher
<metze@samba.org>
Thu, 19 Mar 2009 08:06:38 +0000
(09:06 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Thu, 19 Mar 2009 12:54:17 +0000
(13:54 +0100)
This ways the pcap support in socket wrapper sees the received data.
metze
source3/lib/util_sock.c
patch
|
blob
|
history
diff --git
a/source3/lib/util_sock.c
b/source3/lib/util_sock.c
index de5b232aac7eba495a31d4d285061c176c41dc91..a0dbca1a001ed01046b287bb91c2d7f5107d6fa7 100644
(file)
--- 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_re
ad(fd, buf + nread, maxcnt - nread
);
+ readret = sys_re
cv(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_re
ad(fd, buf+nread, maxcnt-nread
);
+ readret = sys_re
cv(fd, buf+nread, maxcnt-nread, 0
);
if (readret == 0) {
/* we got EOF on the file descriptor */