diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-08-07 09:48:22 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-08-07 11:16:36 +0200 |
| commit | 5ac4d3d27448c7ccc7e0ae0b7ee3c83409821d43 (patch) | |
| tree | 93cee593b83212b7ca66596f6fdbe37f2d68b736 | |
| parent | 83a746d7f54f7a99ee6b3e26100f8e2c19e3c3bd (diff) | |
| download | samba-5ac4d3d27448c7ccc7e0ae0b7ee3c83409821d43.tar.gz samba-5ac4d3d27448c7ccc7e0ae0b7ee3c83409821d43.tar.bz2 samba-5ac4d3d27448c7ccc7e0ae0b7ee3c83409821d43.zip | |
s3:smb2_server: move 'conn' to main block of smbd_smb2_request_dispatch()
metze
| -rw-r--r-- | source3/smbd/smb2_server.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 1c19cce442..625859e914 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -1568,6 +1568,7 @@ NTSTATUS smbd_smb2_request_verify_sizes(struct smbd_smb2_request *req, NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) { + struct smbXsrv_connection *conn = req->sconn->conn; const uint8_t *inhdr; uint16_t opcode; uint32_t flags; @@ -1590,7 +1591,7 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) smb2_opcode_name(opcode), (unsigned long long)mid)); - if (get_Protocol() >= PROTOCOL_SMB2_02) { + if (conn->protocol >= PROTOCOL_SMB2_02) { /* * once the protocol is negotiated * SMB2_OP_NEGPROT is not allowed anymore @@ -1642,7 +1643,6 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) req->do_signing = false; if (flags & SMB2_HDR_FLAG_SIGNED) { - struct smbXsrv_connection *conn; DATA_BLOB signing_key; if (x == NULL) { @@ -1650,7 +1650,6 @@ NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) req, NT_STATUS_ACCESS_DENIED); } - conn = x->connection; signing_key = x->global->channels[0].signing_key; if (!NT_STATUS_IS_OK(session_status)) { |