diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-05-21 10:27:50 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-08-06 09:51:11 +0200 |
| commit | cd8105484c55341972ae7ef980446f99313d3cd2 (patch) | |
| tree | e912f73de79d5e533398a07ad4faaced40712fef /source3/smbd/reply.c | |
| parent | b05b4cab25d249efa260bca61970f5210f210e1c (diff) | |
| download | samba-cd8105484c55341972ae7ef980446f99313d3cd2.tar.gz samba-cd8105484c55341972ae7ef980446f99313d3cd2.tar.xz samba-cd8105484c55341972ae7ef980446f99313d3cd2.zip | |
s3:smbd: move sconn->smb1.negprot.* to xconn->smb1.negprot.*
This prepares the structures for multi-channel support.
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/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 784f10ccbf..72f493194a 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -694,6 +694,7 @@ void reply_tcon(struct smb_request *req) const char *p2; TALLOC_CTX *ctx = talloc_tos(); struct smbd_server_connection *sconn = req->sconn; + struct smbXsrv_connection *xconn = sconn->conn; NTTIME now = timeval_to_nttime(&req->request_time); START_PROFILE(SMBtcon); @@ -735,7 +736,7 @@ void reply_tcon(struct smb_request *req) } reply_outbuf(req, 2, 0); - SSVAL(req->outbuf,smb_vwv0,sconn->smb1.negprot.max_recv); + SSVAL(req->outbuf,smb_vwv0,xconn->smb1.negprot.max_recv); SSVAL(req->outbuf,smb_vwv1,conn->cnum); SSVAL(req->outbuf,smb_tid,conn->cnum); @@ -771,6 +772,7 @@ void reply_tcon_and_X(struct smb_request *req) bool session_key_updated = false; uint16_t optional_support = 0; struct smbd_server_connection *sconn = req->sconn; + struct smbXsrv_connection *xconn = sconn->conn; START_PROFILE(SMBtconX); @@ -818,7 +820,7 @@ void reply_tcon_and_X(struct smb_request *req) return; } - if (sconn->smb1.negprot.encrypted_passwords) { + if (xconn->smb1.negprot.encrypted_passwords) { p = req->buf + passlen; } else { p = req->buf + passlen + 1; |