From: Jeremy Allison <jra@samba.org>
Date: Wed, 17 Jul 2019 21:56:42 +0000 (-0700)
Subject: s3: smbd: Remove dptr_close() from dptr_closecnum().
X-Git-Tag: tdb-1.4.2~337
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=196fe53ede8743ab02a2a29d574cfd27632ceb3f;p=thirdparty%2Fsamba.git

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 003b2d92e19..1ca167bb1ec 100644
--- 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;
 		}
 	}
 }