sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

s3:smb2_server: pass smbXsrv_connection to smbd_smb2_first_negprot()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-06-11 10:42:01 +02:00 committed by Michael Adam
parent bfc702b9a0
commit 3a622c785c
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/smbd/globals.h
View File

@ -224,7 +224,7 @@ bool smbd_is_smb2_header(const uint8_t *inbuf, size_t size);
void reply_smb2002(struct smb_request *req, uint16_t choice);
void reply_smb20ff(struct smb_request *req, uint16_t choice);
void smbd_smb2_first_negprot(struct smbd_server_connection *sconn,
void smbd_smb2_first_negprot(struct smbXsrv_connection *xconn,
uint8_t *inbuf, size_t size);
DATA_BLOB smbd_smb2_generate_outbody(struct smbd_smb2_request *req, size_t size);

2
source3/smbd/process.c
View File

@ -1878,7 +1878,7 @@ static void process_smb(struct smbXsrv_connection *xconn,
/* At this point we're not really using smb2,
* we make the decision here.. */
if (smbd_is_smb2_header(inbuf, nread)) {
smbd_smb2_first_negprot(sconn, inbuf, nread);
smbd_smb2_first_negprot(xconn, inbuf, nread);
return;
} else if (nread >= smb_size && valid_smb_header(sconn, inbuf)
&& CVAL(inbuf, smb_com) != 0x72) {

2
source3/smbd/smb2_negprot.c
View File

@ -59,7 +59,7 @@ static void reply_smb20xx(struct smb_request *req, uint16_t dialect)
req->outbuf = NULL;
smbd_smb2_first_negprot(req->sconn, smb2_inbuf, len);
smbd_smb2_first_negprot(req->xconn, smb2_inbuf, len);
return;
}

3
source3/smbd/smb2_server.c
View File

@ -3005,9 +3005,10 @@ static NTSTATUS smbd_smb2_request_next_incoming(struct smbd_server_connection *s
return NT_STATUS_OK;
}
void smbd_smb2_first_negprot(struct smbd_server_connection *sconn,
void smbd_smb2_first_negprot(struct smbXsrv_connection *xconn,
uint8_t *inbuf, size_t size)
{
struct smbd_server_connection *sconn = xconn->sconn;
NTSTATUS status;
struct smbd_smb2_request *req = NULL;