1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00

Revert "s3: Fix starving the echo responder"

This reverts commit d5cf6482ed.

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

metze
This commit is contained in:
Stefan Metzmacher 2011-01-24 08:56:56 +01:00
parent 19d3779274
commit 6953e2fa66

View File

@ -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;
}