diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-06-11 03:22:53 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-08-06 09:51:12 +0200 |
| commit | 4c9c53f5e4edfcadaba386cd6ac565d64d23f4fa (patch) | |
| tree | 35ce2f3ca93c8a5cb346ab968fbbaee546b0e3f6 /source3 | |
| parent | 77b40fd72e38af675744ba8e36aba612bcdd9ea4 (diff) | |
| download | samba-4c9c53f5e4edfcadaba386cd6ac565d64d23f4fa.tar.gz samba-4c9c53f5e4edfcadaba386cd6ac565d64d23f4fa.tar.xz samba-4c9c53f5e4edfcadaba386cd6ac565d64d23f4fa.zip | |
s3:smbd: use smbXsrv_connection in switch_message()
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')
| -rw-r--r-- | source3/smbd/process.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index b8baa42f03..c0157332f5 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1450,7 +1450,7 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req) int flags; uint64_t session_tag; connection_struct *conn = NULL; - struct smbd_server_connection *sconn = req->sconn; + struct smbXsrv_connection *xconn = req->xconn; NTTIME now = timeval_to_nttime(&req->request_time); struct smbXsrv_session *session = NULL; NTSTATUS status; @@ -1493,7 +1493,7 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req) * Note: for now we only check for NT_STATUS_NETWORK_SESSION_EXPIRED * here, the main check is still in change_to_user() */ - status = smb1srv_session_lookup(sconn->conn, + status = smb1srv_session_lookup(xconn, session_tag, now, &session); @@ -1511,10 +1511,10 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req) } } - if (session_tag != sconn->conn->last_session_id) { + if (session_tag != xconn->last_session_id) { struct user_struct *vuser = NULL; - sconn->conn->last_session_id = session_tag; + xconn->last_session_id = session_tag; if (session) { vuser = session->compat; } @@ -1609,7 +1609,7 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req) return conn; } - raddr = tsocket_address_inet_addr_string(sconn->remote_address, + raddr = tsocket_address_inet_addr_string(xconn->remote_address, talloc_tos()); if (raddr == NULL) { reply_nterror(req, NT_STATUS_NO_MEMORY); @@ -1621,7 +1621,7 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req) */ ok = allow_access(lp_hosts_deny(-1), lp_hosts_allow(-1), - sconn->remote_hostname, raddr); + xconn->remote_hostname, raddr); TALLOC_FREE(raddr); if (!ok) { |