diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:33:45 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:34:59 +0100 |
| commit | 7930206f5c80b15aded213c3f438ff0120fdea2c (patch) | |
| tree | 57cbf214061fa53d0f5988b0e3ae44624f29e460 /source3 | |
| parent | 0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6 (diff) | |
| download | samba-7930206f5c80b15aded213c3f438ff0120fdea2c.tar.gz samba-7930206f5c80b15aded213c3f438ff0120fdea2c.tar.bz2 samba-7930206f5c80b15aded213c3f438ff0120fdea2c.zip | |
Revert "s3: Make the implicit reference to get_Protocol in lp_use_sendfile() explicit"
This reverts commit 6a149022976fe6a5579ec9afc7a4d2dcb44dc8af.
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 5 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 6 |
3 files changed, 5 insertions, 9 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index d4b734b8f9..4622118542 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4387,8 +4387,7 @@ const char *lp_printcapname(void); bool lp_disable_spoolss( void ); void lp_set_spoolss_state( uint32 state ); uint32 lp_get_spoolss_state( void ); -bool lp_use_sendfile(int snum, enum protocol_types proto, - struct smb_signing_state *signing_state); +bool lp_use_sendfile(int snum, struct smb_signing_state *signing_state); void set_use_sendfile(int snum, bool val); void set_store_dos_attributes(int snum, bool val); void lp_set_mangling_method(const char *new_method); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index b7eb80e3f6..83c6ef59da 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -9714,13 +9714,12 @@ uint32 lp_get_spoolss_state( void ) Ensure we don't use sendfile if server smb signing is active. ********************************************************************/ -bool lp_use_sendfile(int snum, enum protocol_types proto, - struct smb_signing_state *signing_state) +bool lp_use_sendfile(int snum, struct smb_signing_state *signing_state) { bool sign_active = false; /* Using sendfile blows the brains out of any DOS or Win9x TCP stack... JRA. */ - if (proto < PROTOCOL_NT1) { + if (get_Protocol() < PROTOCOL_NT1) { return false; } if (signing_state) { 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; |