mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
r3018: handle STATUS_MORE_ENTRIES from socket_recv() in the messaging code
(This used to be commit 13739b68d8
)
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
53891ed37e
commit
5882311fc4
@ -125,6 +125,7 @@ static void messaging_recv_handler(struct event_context *ev, struct fd_event *fd
|
|||||||
if (rec->ndone < sizeof(rec->header)) {
|
if (rec->ndone < sizeof(rec->header)) {
|
||||||
/* receive the header */
|
/* receive the header */
|
||||||
DATA_BLOB blob;
|
DATA_BLOB blob;
|
||||||
|
blob.length = 0;
|
||||||
status = socket_recv(rec->sock, rec,
|
status = socket_recv(rec->sock, rec,
|
||||||
&blob, sizeof(rec->header) - rec->ndone, 0);
|
&blob, sizeof(rec->header) - rec->ndone, 0);
|
||||||
if (NT_STATUS_IS_ERR(status)) {
|
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) {
|
rec->ndone < sizeof(rec->header) + rec->header.length) {
|
||||||
/* receive the body, if any */
|
/* receive the body, if any */
|
||||||
DATA_BLOB blob;
|
DATA_BLOB blob;
|
||||||
|
blob.length = 0;
|
||||||
status = socket_recv(rec->sock, rec,
|
status = socket_recv(rec->sock, rec,
|
||||||
&blob, sizeof(rec->header) + rec->header.length - rec->ndone, 0);
|
&blob, sizeof(rec->header) + rec->header.length - rec->ndone, 0);
|
||||||
if (NT_STATUS_IS_ERR(status)) {
|
if (NT_STATUS_IS_ERR(status)) {
|
||||||
|
Reference in New Issue
Block a user