Changeset 752 for trunk/server/lib/async_req

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/async_req/async_sock.c (modified) (1 diff)

trunk/server/lib/async_req/async_sock.c

@@ -331 +331 @@
         struct async_connect_state *state =
                 tevent_req_data(req, struct async_connect_state);
-
-        /*
-         * Stevens, Network Programming says that if there's a
-         * successful connect, the socket is only writable. Upon an
-         * error, it's both readable and writable.
-         */
-        if ((flags & (TEVENT_FD_READ|TEVENT_FD_WRITE))
-            == (TEVENT_FD_READ|TEVENT_FD_WRITE)) {
-                int ret;
-
-                ret = connect(state->fd,
-                              (struct sockaddr *)(void *)&state->address,
-                              state->address_len);
-                if (ret == 0) {
-                        TALLOC_FREE(fde);
-                        tevent_req_done(req);
-                        return;
-                }
-
-                if (errno == EINPROGRESS) {
-                        /* Try again later, leave the fde around */
-                        return;
-                }
+        int ret;
+
+        ret = connect(state->fd, (struct sockaddr *)(void *)&state->address,
+                      state->address_len);
+        if (ret == 0) {
+                state->sys_errno = 0;
                 TALLOC_FREE(fde);
-                tevent_req_error(req, errno);
-                return;
-        }
-
-        state->sys_errno = 0;
-        tevent_req_done(req);
+                tevent_req_done(req);
+                return;
+        }
+        if (errno == EINPROGRESS) {
+                /* Try again later, leave the fde around */
+                return;
+        }
+        state->sys_errno = errno;
+        TALLOC_FREE(fde);
+        tevent_req_error(req, errno);
+        return;
 }