summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-15 11:31:13 +0200
committerVolker Lendecke <vl@samba.org>2010-08-16 22:39:24 +0200
commitee796255cee4efa280b8896deca492a877b2e135 (patch)
treea61852189ec8e7c7fccf8fc76bf6d1b1122b7929 /source3/smbd
parent95b232a008c00d69280f0fb15425d5f10c21b7a1 (diff)
downloadsamba-ee796255cee4efa280b8896deca492a877b2e135.tar.gz
samba-ee796255cee4efa280b8896deca492a877b2e135.tar.bz2
samba-ee796255cee4efa280b8896deca492a877b2e135.zip
s3: Remove smbd_server_fd() from smbd_server_connection_loop_once
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 88fbd71648..8bd20c2870 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -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)) {