From c8620180083c2bff2e54bb90bcbf89a3d5008fbd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 27 May 2009 11:15:44 +0200 Subject: s3:smbd: move tcon specific globals to struct smbd_server_connection metze --- source3/smbd/reply.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source3/smbd/reply.c') diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 095585a276..0c0d647f71 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -703,7 +703,7 @@ void reply_tcon_and_X(struct smb_request *req) /* we might have to close an old one */ if ((tcon_flags & 0x1) && conn) { - close_cnum(conn,req->vuid); + close_cnum(sconn, conn,req->vuid); req->conn = NULL; conn = NULL; } @@ -4140,6 +4140,7 @@ bool is_valid_writeX_buffer(const uint8_t *inbuf) connection_struct *conn = NULL; unsigned int doff = 0; size_t len = smb_len_large(inbuf); + struct smbd_server_connection *sconn = smbd_server_conn; if (is_encrypted_packet(inbuf)) { /* Can't do this on encrypted @@ -4158,7 +4159,7 @@ bool is_valid_writeX_buffer(const uint8_t *inbuf) return false; } - conn = conn_find(SVAL(inbuf, smb_tid)); + conn = conn_find(sconn, SVAL(inbuf, smb_tid)); if (conn == NULL) { DEBUG(10,("is_valid_writeX_buffer: bad tid\n")); return false; @@ -4829,6 +4830,7 @@ void reply_unlock(struct smb_request *req) void reply_tdis(struct smb_request *req) { + struct smbd_server_connection *sconn = smbd_server_conn; connection_struct *conn = req->conn; START_PROFILE(SMBtdis); @@ -4841,7 +4843,7 @@ void reply_tdis(struct smb_request *req) conn->used = False; - close_cnum(conn,req->vuid); + close_cnum(sconn, conn,req->vuid); req->conn = NULL; reply_outbuf(req, 0, 0); -- cgit