s3:smbd: don't use recvfile if the echo handler is active
authorStefan Metzmacher <metze@samba.org>
Thu, 18 Mar 2010 19:22:26 +0000 (20:22 +0100)
committerMichael Adam <obnox@samba.org>
Fri, 26 Mar 2010 11:43:05 +0000 (12:43 +0100)
metze
(cherry picked from commit 453e6af5b81c8f206d87ec2e62fd79172f695950)

source3/smbd/process.c

index 7d138ba7cd190e8de1b75c4ad4ab27f7b802b566..c039a54ac6443da3a55e77a05f16b892c259d852 100644 (file)
@@ -301,7 +301,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);