summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-08-05 16:44:01 +0200
committerVolker Lendecke <vl@samba.org>2011-08-25 21:36:19 +0200
commitb4b9918cc80ffae55c0c75a93c229c7a29bbb230 (patch)
treed68f33e8c87f245f4cf851ea138aef941dd6dbe5
parent4cb6e1284c362aa0eabdb7d4f964390a0a455bd3 (diff)
downloadsamba-b4b9918cc80ffae55c0c75a93c229c7a29bbb230.tar.gz
samba-b4b9918cc80ffae55c0c75a93c229c7a29bbb230.tar.bz2
samba-b4b9918cc80ffae55c0c75a93c229c7a29bbb230.zip
s3: Pass sconn to valid_smb_header
-rw-r--r--source3/smbd/process.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 6d391df4e0..2d2c56112c 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -199,7 +199,8 @@ int srv_set_message(char *buf,
return (smb_size + num_words*2 + num_bytes);
}
-static bool valid_smb_header(const uint8_t *inbuf)
+static bool valid_smb_header(struct smbd_server_connection *sconn,
+ const uint8_t *inbuf)
{
if (is_encrypted_packet(inbuf)) {
return true;
@@ -1371,7 +1372,7 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req, in
/* Make sure this is an SMB packet. smb_size contains NetBIOS header
* so subtract 4 from it. */
- if (!valid_smb_header(req->inbuf)
+ if (!valid_smb_header(sconn, req->inbuf)
|| (size < (smb_size - 4))) {
DEBUG(2,("Non-SMB packet of length %d. Terminating server\n",
smb_len(req->inbuf)));
@@ -1611,7 +1612,7 @@ static void process_smb(struct smbd_server_connection *sconn,
if (smbd_is_smb2_header(inbuf, nread)) {
smbd_smb2_first_negprot(sconn, inbuf, nread);
return;
- } else if (nread >= smb_size && valid_smb_header(inbuf)
+ } else if (nread >= smb_size && valid_smb_header(sconn, inbuf)
&& CVAL(inbuf, smb_com) != 0x72) {
/* This is a non-negprot SMB1 packet.
Disable SMB2 from now on. */
@@ -2665,7 +2666,7 @@ static bool smbd_echo_reply(uint8_t *inbuf, size_t inbuf_len,
DEBUG(10, ("Got short packet: %d bytes\n", (int)inbuf_len));
return false;
}
- if (!valid_smb_header(inbuf)) {
+ if (!valid_smb_header(smbd_server_conn, inbuf)) {
DEBUG(10, ("Got invalid SMB header\n"));
return false;
}