summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-15 11:40:28 +0200
committerVolker Lendecke <vl@samba.org>2010-08-16 22:39:25 +0200
commit2cd643865d89b403f1b30b68ba4e6f040705dc8d (patch)
tree8a39bc570c7df975746f35835912ff238a3185c6 /source3/smbd
parenta23483310d4403071ec77e50d83b1a679ca20cdf (diff)
downloadsamba-2cd643865d89b403f1b30b68ba4e6f040705dc8d.tar.gz
samba-2cd643865d89b403f1b30b68ba4e6f040705dc8d.tar.bz2
samba-2cd643865d89b403f1b30b68ba4e6f040705dc8d.zip
s3: Remove smbd_server_fd() from smbd_echo_reader
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 be0564224b..556915a020 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2665,7 +2665,7 @@ static void smbd_echo_reader(struct tevent_context *ev,
exit(1);
}
- if (!fd_is_readable(smbd_server_fd())) {
+ if (!fd_is_readable(sconn->sock)) {
DEBUG(10,("echo_handler[%d] the parent smbd was faster\n",
(int)sys_getpid()));
ok = smbd_unlock_socket_internal(sconn);
@@ -2688,7 +2688,7 @@ static void smbd_echo_reader(struct tevent_context *ev,
DEBUG(10,("echo_handler[%d]: reading pdu\n", (int)sys_getpid()));
- status = receive_smb_talloc(state->pending, smbd_server_fd(),
+ status = receive_smb_talloc(state->pending, sconn->sock,
(char **)(void *)&state->pending[num_pending].iov_base,
0 /* timeout */,
&unread,