summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-17 12:41:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:58 -0500
commit5882311fc46132e0f939d3297fd98787ebac41f7 (patch)
tree0c0e16382b04392688a72c695e0a15fa6d76eedd /source4
parent53891ed37e32a97380430e6911878f3b94133e01 (diff)
downloadsamba-5882311fc46132e0f939d3297fd98787ebac41f7.tar.gz
samba-5882311fc46132e0f939d3297fd98787ebac41f7.tar.bz2
samba-5882311fc46132e0f939d3297fd98787ebac41f7.zip
r3018: handle STATUS_MORE_ENTRIES from socket_recv() in the messaging code
(This used to be commit 13739b68d8357d5d330f12b851d0311feb81e545)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/messaging/messaging.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index f9caf5071c..7e87ea45df 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -125,6 +125,7 @@ static void messaging_recv_handler(struct event_context *ev, struct fd_event *fd
if (rec->ndone < sizeof(rec->header)) {
/* receive the header */
DATA_BLOB blob;
+ blob.length = 0;
status = socket_recv(rec->sock, rec,
&blob, sizeof(rec->header) - rec->ndone, 0);
if (NT_STATUS_IS_ERR(status)) {
@@ -159,6 +160,7 @@ static void messaging_recv_handler(struct event_context *ev, struct fd_event *fd
rec->ndone < sizeof(rec->header) + rec->header.length) {
/* receive the body, if any */
DATA_BLOB blob;
+ blob.length = 0;
status = socket_recv(rec->sock, rec,
&blob, sizeof(rec->header) + rec->header.length - rec->ndone, 0);
if (NT_STATUS_IS_ERR(status)) {