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>

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 8055d50181fca04ec87e6932eb949b0ae8422fed..b7f40366058ef2966f8abfa820415ca0d105d716 100644 (file)
--- 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 c8d6079f9d015e1b8180d9b3788eed8c130af4f9..b970f00b9d3385822bc546b36ac04898d5ca6e4b 100644 (file)
--- 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 fde951462cc12b1a1facfee741a4c9859153f868..3f76f3f0f518aee4a07c74085bc2235378a87517 100644 (file)
--- 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 eee08f1cd88290f083545a174f0fea7397f4798a..59cb6d89e3526a08e056db9bd1d3a4603089e574 100644 (file)
--- 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;