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

s3: smbd: Remove dptr_close() from dptr_closecnum().

Browse Source 
Now we're handle-based close_file() already does
what is needed to shut down directory enumeration.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2019-07-17 14:56:42 -07:00 committed by Ralph Boehme
parent a8ca5dc467
commit 196fe53ede
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source3/smbd/dir.c
View File

@ -261,18 +261,9 @@ void dptr_closecnum(connection_struct *conn)
for(dptr = sconn->searches.dirptrs; dptr; dptr = next) {
next = dptr->next;
if (dptr->conn == conn) {
int key = dptr->dnum;
files_struct *fsp = NULL;
if (dptr->dir_hnd != NULL &&
dptr->dir_hnd->fsp != NULL) {
fsp = dptr->dir_hnd->fsp;
}
dptr_close(sconn, &key);
if (fsp != NULL) {
close_file(NULL, fsp, NORMAL_CLOSE);
fsp = NULL;
}
files_struct *fsp = dptr->dir_hnd->fsp;
close_file(NULL, fsp, NORMAL_CLOSE);
fsp = NULL;
}
}
}