Changeset 668 for trunk/server/lib

Timestamp:

Nov 24, 2011, 6:19:16 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: sockets got not back to blocking, as fcntl is broken

File:

• trunk/server/lib/async_req/async_sock.c (modified) (2 diffs)

trunk/server/lib/async_req/async_sock.c

@@ -282 +282 @@
  done:
         fcntl(fd, F_SETFL, state->old_sockflags);
+#ifdef __OS2__ // if the old flags have blocking set we need to set it also (fcntl bug)
+        if (!(state->old_sockflags & O_NONBLOCK)) {
+                set_blocking(state->fd, true);
+        }
+#endif
         return tevent_req_post(result, ev);
 }
@@ -340 +345 @@
 
         fcntl(state->fd, F_SETFL, state->old_sockflags);
-
+#ifdef __OS2__ // if the old flags have blocking set we need to set it also (fcntl bug)
+        if (!(state->old_sockflags & O_NONBLOCK)) {
+                set_blocking(state->fd, true);
+        }
+#endif
         if (tevent_req_is_unix_error(req, &err)) {
                 *perrno = err;