summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-03-19 12:08:13 +0100
committerStefan Metzmacher <metze@samba.org>2010-03-22 17:15:13 +0100
commitfbf112bd1684acf420b104e0e7d66721af47c676 (patch)
tree39ffe65878e8d3d09b1174f4282443d5f0060c2e
parent453e6af5b81c8f206d87ec2e62fd79172f695950 (diff)
downloadsamba-fbf112bd1684acf420b104e0e7d66721af47c676.tar.gz
samba-fbf112bd1684acf420b104e0e7d66721af47c676.tar.bz2
samba-fbf112bd1684acf420b104e0e7d66721af47c676.zip
s3:smbd: disable sendfile if the echo handler is active
metze
-rw-r--r--source3/smbd/reply.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 175c0156e8..082775f1ae 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3454,6 +3454,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