From 6953e2fa66410d466832b5e582921a291d224c5b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 24 Jan 2011 08:56:56 +0100 Subject: Revert "s3: Fix starving the echo responder" This reverts commit d5cf6482ed0cd9a11448ca04944b2e01200a7c89. I'll add a more generic fix for this problem. metze --- source3/smbd/process.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 04ea747564..f5cc43e86e 100644 --- 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; } -- cgit