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

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>

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 003b2d92e19c834b9ab96a83145be07737b92b6e..1ca167bb1ecd678e9389fc95941af6bc625acd87 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -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;
                }
        }
 }