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/files.c | |
| parent | ef408e5068255449eda9b4fc5c483713e91e560d (diff) | |
| download | samba-463b308f16733b5a0bd896c46347d39064cee170.tar.gz samba-463b308f16733b5a0bd896c46347d39064cee170.tar.bz2 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/files.c')
| -rw-r--r-- | source3/smbd/files.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/smbd/files.c b/source3/smbd/files.c index bec157b3da..d11d6d764b 100644 --- a/source3/smbd/files.c +++ b/source3/smbd/files.c @@ -680,7 +680,7 @@ struct files_struct *file_fsp_smb2(struct smbd_smb2_request *smb2req, return NULL; } - if (smb2req->tcon->compat_conn != fsp->conn) { + if (smb2req->tcon->compat != fsp->conn) { return NULL; } @@ -688,7 +688,11 @@ struct files_struct *file_fsp_smb2(struct smbd_smb2_request *smb2req, return NULL; } - if (smb2req->session->vuid != fsp->vuid) { + if (smb2req->session->compat == NULL) { + return NULL; + } + + if (smb2req->session->compat->vuid != fsp->vuid) { return NULL; } |