[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  9e17e7d lib/async_req: Retry read_packet with read(2)
      from  1cc7abf s3: Remove the sys_notify dependency from notify_internal

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


- Log -----------------------------------------------------------------
commit 9e17e7d7f28bc186d316f8b8c89e0c6d266a2196
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Mar 23 15:56:43 2012 +0100

    lib/async_req: Retry read_packet with read(2)
    
    This way it will also work with pipes
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Fri Mar 23 17:31:24 CET 2012 on sn-devel-104

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

Summary of changes:
 lib/async_req/async_sock.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 545d213..9909bc6 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -596,6 +596,10 @@ static void read_packet_handler(struct tevent_context *ev,
 
 	nread = recv(state->fd, state->buf+state->nread, total-state->nread,
 		     0);
+	if ((nread == -1) && (errno == ENOTSOCK)) {
+		nread = read(state->fd, state->buf+state->nread,
+			     total-state->nread);
+	}
 	if ((nread == -1) && (errno == EINTR)) {
 		/* retry */
 		return;


-- 
Samba Shared Repository