diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-15 08:54:23 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-16 22:39:23 +0200 |
| commit | 209b3aee1c265a3d81ede4242963c043288289bb (patch) | |
| tree | 1e52dbe5564e13a0c494503cb205c01665181105 | |
| parent | cc5f83831961fdcee1a286ff465e616cbcba1f13 (diff) | |
| download | samba-209b3aee1c265a3d81ede4242963c043288289bb.tar.gz samba-209b3aee1c265a3d81ede4242963c043288289bb.tar.bz2 samba-209b3aee1c265a3d81ede4242963c043288289bb.zip | |
s3: Remove smbd_server_fd() from send_file_readbraw
| -rw-r--r-- | source3/smbd/reply.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 4cbe4425e8..761a6b490e 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2934,8 +2934,10 @@ static void send_file_readbraw(connection_struct *conn, _smb_setlen(header,nread); header_blob = data_blob_const(header, 4); - if ((sendfile_read = SMB_VFS_SENDFILE(smbd_server_fd(), fsp, - &header_blob, startpos, nread)) == -1) { + sendfile_read = SMB_VFS_SENDFILE(sconn->sock, fsp, + &header_blob, startpos, + nread); + if (sendfile_read == -1) { /* Returning ENOSYS means no data at all was sent. * Do this as a normal read. */ if (errno == ENOSYS) { @@ -3011,7 +3013,7 @@ normal_readbraw: } _smb_setlen(outbuf,ret); - if (write_data(smbd_server_fd(),outbuf,4+ret) != 4+ret) + if (write_data(sconn->sock, outbuf, 4+ret) != 4+ret) fail_readraw(); TALLOC_FREE(outbuf); |