Changeset 874 for trunk/server/source3/lib/system.c

Timestamp:

Feb 18, 2015, 10:18:05 AM (11 years ago)

Author:

Silvan Scherrer

Message:

samba server 3.6: update trunk to 3.6.24

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/system.c (modified) (2 diffs)

trunk/server/source3/lib/system.c

@@ -282 +282 @@
 /*******************************************************************
 A recvfrom wrapper that will deal with EINTR.
+NB. As used with non-blocking sockets, return on EAGAIN/EWOULDBLOCK
 ********************************************************************/
 
@@ -290 +291 @@
         do {
                 ret = recvfrom(s, buf, len, flags, from, fromlen);
-#if defined(EWOULDBLOCK)
-        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
-#else
-        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
-#endif
+        } while (ret == -1 && (errno == EINTR));
         return ret;
 }