diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-03-27 11:09:05 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-06-25 20:55:06 +0200 |
| commit | 463b308f16733b5a0bd896c46347d39064cee170 (patch) | |
| tree | 7880a96961d639c6de21f3225e6f56fade312a0c /source3/smbd/service.c | |
| parent | ef408e5068255449eda9b4fc5c483713e91e560d (diff) | |
| download | samba-463b308f16733b5a0bd896c46347d39064cee170.tar.gz samba-463b308f16733b5a0bd896c46347d39064cee170.tar.xz samba-463b308f16733b5a0bd896c46347d39064cee170.zip | |
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 <obnox@samba.org>
metze
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 1bcbbcda6a3..fe5838225d9 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)) { |