s3:smbd: disable sendfile if the echo handler is active
authorStefan Metzmacher <metze@samba.org>
Fri, 19 Mar 2010 11:08:13 +0000 (12:08 +0100)
committerMichael Adam <obnox@samba.org>
Fri, 26 Mar 2010 11:43:06 +0000 (12:43 +0100)
metze
(cherry picked from commit fbf112bd1684acf420b104e0e7d66721af47c676)

source3/smbd/reply.c

index e13c803094e600bfcc282408abd2775fff2b214a..5a960873bc3dceb7e52a86a79445ac0459c772dc 100644 (file)
@@ -3333,6 +3333,10 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
                goto nosendfile_read;
        }
 
+       if (smbd_server_conn->smb1.echo_handler.trusted_fde) {
+               goto nosendfile_read;
+       }
+
 #if defined(WITH_SENDFILE)
        /*
         * We can only use sendfile on a non-chained packet