diff options
| -rw-r--r-- | source3/smbd/dir.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 7bca6bfd3d..00c33d6ec2 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -679,20 +679,12 @@ done: void dptr_CloseDir(files_struct *fsp) { if (fsp->dptr) { -/* - * Ugly hack. We have defined fdopendir to return ENOSYS if dirfd also isn't - * present. I hate Solaris. JRA. - */ -#ifdef HAVE_DIRFD - if (fsp->fh->fd != -1 && - fsp->dptr->dir_hnd && - dirfd(fsp->dptr->dir_hnd->dir)) { - /* The call below closes the underlying fd. */ - fsp->fh->fd = -1; - } -#endif + /* + * The destructor for the struct smb_Dir + * (fsp->dptr->dir_hnd) now handles + * all resource deallocation. + */ dptr_close_internal(fsp->dptr); - fsp->dptr = NULL; } } |