]> git.samba.org - obnox/samba-ctdb.git/commitdiff
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>
Mon, 22 Mar 2010 16:48:06 +0000 (17:48 +0100)
metze

source3/smbd/reply.c

index 0824449a474c61a65b6dae4a69abe9d8f1087bd5..56ef605e7f6beffa75c922aa7a40165196bca567 100644 (file)
@@ -3301,6 +3301,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