Changeset 668

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

Location:

trunk/server

Files:

• lib/async_req/async_sock.c (modified) (2 diffs)
• source3/libsmb/clireadwrite.c (modified) (1 diff)
• source3/smbd/server.c (modified) (1 diff)

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;

trunk/server/source3/libsmb/clireadwrite.c

@@ -815 +815 @@
 
         writesize = cli_write_max_bufsize(cli, write_mode);
-printf("@remove me: writesize %d\n", writesize);
+
         blocks = (size + (writesize-1)) / writesize;
 

trunk/server/source3/smbd/server.c

@@ -747 +747 @@
                 int ret;
                 TALLOC_CTX *frame = talloc_stackframe();
-
                 ret = tevent_loop_once(smbd_event_context());
                 if (ret != 0) {