summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-03-18 20:22:26 +0100
committerStefan Metzmacher <metze@samba.org>2010-03-22 17:15:13 +0100
commit453e6af5b81c8f206d87ec2e62fd79172f695950 (patch)
tree08fde99f49973ebbdda47ccb67569dcf8c670245 /source3
parent79e5e3dda7178c4d3c5952a48474d6dcafba91ec (diff)
downloadsamba-453e6af5b81c8f206d87ec2e62fd79172f695950.tar.gz
samba-453e6af5b81c8f206d87ec2e62fd79172f695950.tar.bz2
samba-453e6af5b81c8f206d87ec2e62fd79172f695950.zip
s3:smbd: don't use recvfile if the echo handler is active
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/process.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 376db2340b..5b8b42d5bf 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -312,7 +312,8 @@ static NTSTATUS receive_smb_raw_talloc(TALLOC_CTX *mem_ctx, int fd,
if (CVAL(lenbuf,0) == 0 && min_recv_size &&
(smb_len_large(lenbuf) > /* Could be a UNIX large writeX. */
(min_recv_size + STANDARD_WRITE_AND_X_HEADER_SIZE)) &&
- !srv_is_signing_active(smbd_server_conn)) {
+ !srv_is_signing_active(smbd_server_conn) &&
+ smbd_server_conn->smb1.echo_handler.trusted_fde == NULL) {
return receive_smb_raw_talloc_partial_read(
mem_ctx, lenbuf, fd, buffer, timeout, p_unread, plen);