diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-06-11 10:51:04 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-08-06 09:51:12 +0200 |
| commit | 90b27f155930a9feb6281b291a61bcf5111d3898 (patch) | |
| tree | fefa19c90530fd25b6152e23dba5ad7ea7b47b66 | |
| parent | 694c048bbda5678f34c4096bb528c0860d06c3fb (diff) | |
| download | samba-90b27f155930a9feb6281b291a61bcf5111d3898.tar.gz samba-90b27f155930a9feb6281b291a61bcf5111d3898.tar.xz samba-90b27f155930a9feb6281b291a61bcf5111d3898.zip | |
s3:smb2_server: pass smbXsrv_connection to smbd_smb2_request_create()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source3/smbd/smb2_server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index af2330d7d0..e0d906f35c 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -505,11 +505,11 @@ inval: return NT_STATUS_INVALID_PARAMETER; } -static NTSTATUS smbd_smb2_request_create(struct smbd_server_connection *sconn, +static NTSTATUS smbd_smb2_request_create(struct smbXsrv_connection *xconn, uint8_t *inbuf, size_t size, struct smbd_smb2_request **_req) { - struct smbXsrv_connection *xconn = sconn->conn; + struct smbd_server_connection *sconn = xconn->sconn; struct smbd_smb2_request *req; uint32_t protocol_version; const uint8_t *inhdr = NULL; @@ -558,7 +558,7 @@ static NTSTATUS smbd_smb2_request_create(struct smbd_server_connection *sconn, req->request_time = timeval_current(); now = timeval_to_nttime(&req->request_time); - status = smbd_smb2_inbuf_parse_compound(sconn->conn, + status = smbd_smb2_inbuf_parse_compound(xconn, now, inbuf + NBT_HDR_SIZE, size - NBT_HDR_SIZE, @@ -3019,7 +3019,7 @@ void smbd_smb2_first_negprot(struct smbXsrv_connection *xconn, return; } - status = smbd_smb2_request_create(sconn, inbuf, size, &req); + status = smbd_smb2_request_create(xconn, inbuf, size, &req); if (!NT_STATUS_IS_OK(status)) { smbd_server_connection_terminate(sconn, nt_errstr(status)); return; |