diff options
| author | Jeremy Allison <jra@samba.org> | 2008-01-10 16:36:05 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-01-10 16:36:05 -0800 |
| commit | 6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57 (patch) | |
| tree | 90f31e435fac5c882591305e7ff1ff4377eec266 /source3/smbd | |
| parent | f33f4ef4a24fcbf09eeba0d51e7db74e9b13b432 (diff) | |
| parent | fef9cf00e1e110ff5872f1c368d080fe4f7939d6 (diff) | |
| download | samba-6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57.tar.gz samba-6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57.tar.bz2 samba-6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 767e0164adf8803df50b0b7bd8e81d25af72bb78)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/reply.c | 4 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 79c0176e64..8149f5aeb6 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2654,7 +2654,7 @@ void send_file_readbraw(connection_struct *conn, _smb_setlen(header,nread); header_blob = data_blob_const(header, 4); - if ( SMB_VFS_SENDFILE( smbd_server_fd(), fsp, fsp->fh->fd, + if (SMB_VFS_SENDFILE(smbd_server_fd(), fsp, &header_blob, startpos, nread) == -1) { /* Returning ENOSYS means no data at all was sent. * Do this as a normal read. */ @@ -3137,7 +3137,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, construct_reply_common((char *)req->inbuf, (char *)headerbuf); setup_readX_header((char *)headerbuf, smb_maxcnt); - if ((nread = SMB_VFS_SENDFILE( smbd_server_fd(), fsp, fsp->fh->fd, &header, startpos, smb_maxcnt)) == -1) { + if ((nread = SMB_VFS_SENDFILE(smbd_server_fd(), fsp, &header, startpos, smb_maxcnt)) == -1) { /* Returning ENOSYS means no data at all was sent. Do this as a normal read. */ if (errno == ENOSYS) { goto normal_read; diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index 1e71da742c..33a3a43aa4 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -445,7 +445,6 @@ ssize_t vfs_write_data(struct smb_request *req, req->unread_bytes = 0; return SMB_VFS_RECVFILE(smbd_server_fd(), fsp, - fsp->fh->fd, (SMB_OFF_T)-1, N); } @@ -479,7 +478,6 @@ ssize_t vfs_pwrite_data(struct smb_request *req, req->unread_bytes = 0; return SMB_VFS_RECVFILE(smbd_server_fd(), fsp, - fsp->fh->fd, offset, N); } |