summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-15 11:39:09 +0200
committerVolker Lendecke <vl@samba.org>2010-08-16 22:39:25 +0200
commita23483310d4403071ec77e50d83b1a679ca20cdf (patch)
tree48178382fb2bbc275e558b8ead08f8f4edcc1f0d /source3/smbd
parentbb867df269a3c39c6f757f53c3770a0501eb42ff (diff)
downloadsamba-a23483310d4403071ec77e50d83b1a679ca20cdf.tar.gz
samba-a23483310d4403071ec77e50d83b1a679ca20cdf.tar.bz2
samba-a23483310d4403071ec77e50d83b1a679ca20cdf.zip
s3: Remove smbd_server_fd() from smbd_echo_reply
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/process.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 450d2580c8..be0564224b 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2565,8 +2565,7 @@ static void smbd_echo_writer_done(struct tevent_req *req)
smbd_echo_activate_writer(state);
}
-static bool smbd_echo_reply(int fd,
- uint8_t *inbuf, size_t inbuf_len,
+static bool smbd_echo_reply(uint8_t *inbuf, size_t inbuf_len,
uint32_t seqnum)
{
struct smb_request req;
@@ -2622,7 +2621,7 @@ static bool smbd_echo_reply(int fd,
out_len = smb_len(req.outbuf) + 4;
- ok = srv_send_smb(smbd_server_fd(),
+ ok = srv_send_smb(req.sconn->sock,
(char *)outbuf,
true, seqnum+1,
false, &req.pcd);
@@ -2717,8 +2716,7 @@ static void smbd_echo_reader(struct tevent_context *ev,
SIVAL((uint8_t *)state->pending[num_pending].iov_base, smb_ss_field, seqnum);
SIVAL((uint8_t *)state->pending[num_pending].iov_base, smb_ss_field+4, NT_STATUS_V(NT_STATUS_OK));
- reply = smbd_echo_reply(smbd_server_fd(),
- (uint8_t *)state->pending[num_pending].iov_base,
+ reply = smbd_echo_reply((uint8_t *)state->pending[num_pending].iov_base,
state->pending[num_pending].iov_len,
seqnum);
if (reply) {