diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-06-11 10:42:01 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-08-06 09:51:12 +0200 |
| commit | 3a622c785c49999a1905b401f223bc9f938aa565 (patch) | |
| tree | ce73c6834e94de5994fd054cfec2e131365800b6 /source3/smbd | |
| parent | bfc702b9a032b216d0c53812553d7c1a64916f82 (diff) | |
| download | samba-3a622c785c49999a1905b401f223bc9f938aa565.tar.gz | |
s3:smb2_server: pass smbXsrv_connection to smbd_smb2_first_negprot()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/globals.h | 2 | ||||
| -rw-r--r-- | source3/smbd/process.c | 2 | ||||
| -rw-r--r-- | source3/smbd/smb2_negprot.c | 2 | ||||
| -rw-r--r-- | source3/smbd/smb2_server.c | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 8055d50181f..b7f40366058 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -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); diff --git a/source3/smbd/process.c b/source3/smbd/process.c index c8d6079f9d0..b970f00b9d3 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -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) { diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index fde951462cc..3f76f3f0f51 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -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; } diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index eee08f1cd88..59cb6d89e35 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -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; |