From e00bfc509219cce65168f9ef4532eeff09e6f5fb Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 28 Mar 2008 17:31:06 -0700 Subject: Only allow sendfile on non-stream fsp's. Should fix make test for streams as sendfile isn't implemented in the streams vfs modules yet. Jeremy. (This used to be commit eef53e9603d4f3d892ffe00b061def5d717ca481) --- source3/smbd/reply.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index bababfecac..eb8e5ff915 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2656,7 +2656,7 @@ void send_file_readbraw(connection_struct *conn, * reply_readbraw has already checked the length. */ - if ( (chain_size == 0) && (nread > 0) && + if ( (chain_size == 0) && (nread > 0) && (fsp->base_fsp == NULL) (fsp->wcp == NULL) && lp_use_sendfile(SNUM(conn)) ) { char header[4]; DATA_BLOB header_blob; @@ -3131,7 +3131,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, */ if ((chain_size == 0) && (CVAL(req->inbuf,smb_vwv0) == 0xFF) && - !is_encrypted_packet(req->inbuf) && + !is_encrypted_packet(req->inbuf) && (fsp->base_fsp == NULL) && lp_use_sendfile(SNUM(conn)) && (fsp->wcp == NULL) ) { uint8 headerbuf[smb_size + 12 * 2]; DATA_BLOB header; -- cgit