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)

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index bababfecacd8f0d8d21a2f9cc867717117ba933a..eb8e5ff91531dfbed11ff07ef20c2b97dd0a7f2c 100644 (file)
--- 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;