From 463b308f16733b5a0bd896c46347d39064cee170 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 27 Mar 2012 11:09:05 +0200 Subject: s3:smbd: make use of smbXsrv_tcon and smbXsrv_session for smb2 The removes the protocol specific smbd_smb2_session and smbd_smb2_tcon. Pair-Programmed-With: Michael Adam metze --- source3/smbd/service.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source3/smbd/service.c') diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 1bcbbcda6a..fe5838225d 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -941,7 +941,8 @@ static connection_struct *make_connection_smb1(struct smbd_server_connection *sc ****************************************************************************/ connection_struct *make_connection_smb2(struct smbd_server_connection *sconn, - struct smbd_smb2_tcon *tcon, + struct smbXsrv_tcon *tcon, + int snum, struct user_struct *vuser, const char *pdev, NTSTATUS *pstatus) @@ -952,10 +953,13 @@ connection_struct *make_connection_smb2(struct smbd_server_connection *sconn, *pstatus = NT_STATUS_INSUFFICIENT_RESOURCES; return NULL; } - conn->cnum = tcon->tid; + + conn->cnum = tcon->global->tcon_wire_id; + conn->tcon = tcon; + *pstatus = make_connection_snum(sconn, conn, - tcon->snum, + snum, vuser, pdev); if (!NT_STATUS_IS_OK(*pstatus)) { -- cgit