s3: Remove smbd_server_fd() from smbd_server_connection_loop_once
authorVolker Lendecke <vl@samba.org>
Sun, 15 Aug 2010 09:31:13 +0000 (11:31 +0200)
committerVolker Lendecke <vl@samba.org>
Mon, 16 Aug 2010 20:39:24 +0000 (22:39 +0200)
source3/smbd/process.c

index 88fbd716480682221f3ae5a2a2125f771ea3987d..8bd20c287091990e6385e31c05d7377e63f45b47 100644 (file)
@@ -962,14 +962,14 @@ static NTSTATUS smbd_server_connection_loop_once(struct smbd_server_connection *
        }
 
         if ((conn->smb1.echo_handler.trusted_fd != -1)
-           && FD_ISSET(smbd_server_fd(), &r_fds)
+           && 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(smbd_server_fd(), &r_fds);
+               FD_CLR(conn->sock, &r_fds);
         }
 
        if (run_events(smbd_event_context(), selrtn, &r_fds, &w_fds)) {