Revert "s3: Fix starving the echo responder"

This reverts commit d5cf6482ed0cd9a11448ca04944b2e01200a7c89.

I'll add a more generic fix for this problem.

metze

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 04ea747564a72c7fa84fa013e349d9df8cc37b3a..f5cc43e86e9a58580e10032c7a147cbb5970d50f 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1001,23 +1001,6 @@ static NTSTATUS smbd_server_connection_loop_once(struct smbd_server_connection *
                errno = sav;
        }
 
-       /* Check if error */
-       if (selrtn == -1) {
-               /* something is wrong. Maybe the socket is dead? */
-               return map_nt_error_from_unix(errno);
-       }
-
-        if ((conn->smb1.echo_handler.trusted_fd != -1)
-           && FD_ISSET(conn->sock, &r_fds)
-           && FD_ISSET(conn->smb1.echo_handler.trusted_fd, &r_fds)) {
-               /*
-                * Prefer to read pending requests from the echo handler. To
-                * quote Jeremy (da70f8ab1): This is a hack of monstrous
-                * proportions...
-                */
-               FD_CLR(conn->sock, &r_fds);
-        }
-
        if (run_events(smbd_event_context(), selrtn, &r_fds, &w_fds)) {
                return NT_STATUS_RETRY;
        }