sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3: Slightly simplify file_fnum

Browse Source 
req==NULL should never happen, see the comment
This commit is contained in:
Volker Lendecke 2010-09-27 04:46:18 +02:00
parent e57811440a
commit 3009178ee5
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/smbd/files.c
View File

@ -513,12 +513,25 @@ files_struct *file_fsp(struct smb_request *req, uint16 fid)
{
files_struct *fsp;
if ((req != NULL) && (req->chain_fsp != NULL)) {
if (req == NULL) {
/*
* We should never get here. req==NULL could in theory
* only happen from internal opens with a non-zero
* root_dir_fid. Internal opens just don't do that, at
* least they are not supposed to do so. And if they
* start to do so, they better fake up a smb_request
* from which we get the right smbd_server_conn. While
* this should never happen, let's return NULL here.
*/
return NULL;
}
if (req->chain_fsp != NULL) {
return req->chain_fsp;
}
fsp = file_fnum(smbd_server_conn, fid);
if ((fsp != NULL) && (req != NULL)) {
if (fsp != NULL) {
req->chain_fsp = fsp;
}
return fsp;