From 7930206f5c80b15aded213c3f438ff0120fdea2c Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 23 Nov 2009 16:33:45 +0100 Subject: Revert "s3: Make the implicit reference to get_Protocol in lp_use_sendfile() explicit" This reverts commit 6a149022976fe6a5579ec9afc7a4d2dcb44dc8af. --- source3/smbd/reply.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source3/smbd/reply.c') diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 0b77d82edd..4d7166fe9f 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2925,8 +2925,7 @@ static void send_file_readbraw(connection_struct *conn, if ( !req_is_in_chain(req) && (nread > 0) && (fsp->base_fsp == NULL) && (fsp->wcp == NULL) && - lp_use_sendfile(SNUM(conn), get_Protocol(), - smbd_server_conn->smb1.signing_state) ) { + lp_use_sendfile(SNUM(conn), smbd_server_conn->smb1.signing_state) ) { ssize_t sendfile_read = -1; char header[4]; DATA_BLOB header_blob; @@ -3453,8 +3452,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, if (!req_is_in_chain(req) && !is_encrypted_packet(req->inbuf) && (fsp->base_fsp == NULL) && (fsp->wcp == NULL) && - lp_use_sendfile(SNUM(conn), get_Protocol(), - smbd_server_conn->smb1.signing_state) ) { + lp_use_sendfile(SNUM(conn), smbd_server_conn->smb1.signing_state) ) { uint8 headerbuf[smb_size + 12 * 2]; DATA_BLOB header; -- cgit