diff options
| author | Jeremy Allison <jra@samba.org> | 2007-10-31 14:01:35 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-10-31 14:01:35 -0700 |
| commit | 8cf78776b0a44bd026cef3d74eb11cfb415f8303 (patch) | |
| tree | 610b03e9e4475bd79bbcfe6dacace053a5446b64 /source/smbd/vfs.c | |
| parent | b7088bb9c2a00d4717b9a7efa4bddc0c005f4efb (diff) | |
| download | samba-8cf78776b0a44bd026cef3d74eb11cfb415f8303.tar.gz samba-8cf78776b0a44bd026cef3d74eb11cfb415f8303.tar.xz samba-8cf78776b0a44bd026cef3d74eb11cfb415f8303.zip | |
Make explicit draining the socket on RECVFILE. Add
capability for large UNIX write if not signing and
recvfile set. Cope with large UNIX write length on
incoming processing. Stevef - we can now test 1-16Mb
writes from CIFFS.
Jeremy.
Diffstat (limited to 'source/smbd/vfs.c')
| -rw-r--r-- | source/smbd/vfs.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source/smbd/vfs.c b/source/smbd/vfs.c index 21a12ae766a..78939881d35 100644 --- a/source/smbd/vfs.c +++ b/source/smbd/vfs.c @@ -428,15 +428,14 @@ ssize_t vfs_write_data(struct smb_request *req, if (req && req->unread_bytes) { SMB_ASSERT(req->unread_bytes == N); - ret = SMB_VFS_RECVFILE(smbd_server_fd(), + /* VFS_RECVFILE must drain the socket + * before returning. */ + req->unread_bytes = 0; + return SMB_VFS_RECVFILE(smbd_server_fd(), fsp, fsp->fh->fd, (SMB_OFF_T)-1, N); - if (ret != -1) { - req->unread_bytes = 0; - } - return ret; } while (total < N) { @@ -463,15 +462,14 @@ ssize_t vfs_pwrite_data(struct smb_request *req, if (req && req->unread_bytes) { SMB_ASSERT(req->unread_bytes == N); - ret = SMB_VFS_RECVFILE(smbd_server_fd(), + /* VFS_RECVFILE must drain the socket + * before returning. */ + req->unread_bytes = 0; + return SMB_VFS_RECVFILE(smbd_server_fd(), fsp, fsp->fh->fd, offset, N); - if (ret != -1) { - req->unread_bytes = 0; - } - return ret; } while (total < N) { |