diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-06-11 14:26:57 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-08-06 09:51:13 +0200 |
| commit | bd97eee2427139606bf6caedd8a407c4b9c3fa06 (patch) | |
| tree | 5e2a65716dd707f8dec7465ef25bf342f8384f28 | |
| parent | b32b5fe66ebe14686d113199b95e095720d023fd (diff) | |
| download | samba-bd97eee2427139606bf6caedd8a407c4b9c3fa06.tar.gz samba-bd97eee2427139606bf6caedd8a407c4b9c3fa06.tar.xz samba-bd97eee2427139606bf6caedd8a407c4b9c3fa06.zip | |
s3:smbd: use req->xconn in nttrans.c
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/nttrans.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 57c41597dc..2521a1ef00 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -67,8 +67,8 @@ static void send_nt_replies(connection_struct *conn, int params_sent_thistime, data_sent_thistime, total_sent_thistime; int alignment_offset = 1; int data_alignment_offset = 0; - struct smbd_server_connection *sconn = req->sconn; - struct smbXsrv_connection *xconn = sconn->conn; + struct smbXsrv_connection *xconn = req->xconn; + struct smbd_server_connection *sconn = xconn->sconn; int max_send = xconn->smb1.sessions.max_send; /* @@ -1339,7 +1339,8 @@ static void call_nt_transact_create(connection_struct *conn, void reply_ntcancel(struct smb_request *req) { - struct smbXsrv_connection *xconn = req->sconn->conn; + struct smbXsrv_connection *xconn = req->xconn; + struct smbd_server_connection *sconn = xconn->sconn; /* * Go through and cancel any pending change notifies. @@ -1347,8 +1348,8 @@ void reply_ntcancel(struct smb_request *req) START_PROFILE(SMBntcancel); srv_cancel_sign_response(xconn); - remove_pending_change_notify_requests_by_mid(req->sconn, req->mid); - remove_pending_lock_requests_by_mid_smb1(req->sconn, req->mid); + remove_pending_change_notify_requests_by_mid(sconn, req->mid); + remove_pending_lock_requests_by_mid_smb1(sconn, req->mid); DEBUG(3,("reply_ntcancel: cancel called on mid = %llu.\n", (unsigned long long)req->mid)); |