From: Jeremy Allison <jra@samba.org>
Date: Wed, 17 Jul 2019 20:53:33 +0000 (-0700)
Subject: s3: smbd: Remove dptr_close() from call_trans2findfirst().
X-Git-Tag: tdb-1.4.2~340
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=269fbc9164615d0e6034b873a76552cb138b24ea;p=thirdparty%2Fsamba.git

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

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/trans2.c b/source3/smbd/trans2.c
index a7a11ae947b..cddcd805578 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3076,7 +3076,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 	/* Check if we can close the dirptr */
 	if(close_after_first || (finished && close_if_end)) {
 		DEBUG(5,("call_trans2findfirst - (2) closing dptr_num %d\n", dptr_num));
-		dptr_close(sconn, &dptr_num);
+		dptr_num = -1;
 		close_file(NULL, fsp, NORMAL_CLOSE);
 		fsp = NULL;
 	}
@@ -3089,7 +3089,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 	 */
 
 	if(numentries == 0) {
-		dptr_close(sconn, &dptr_num);
+		dptr_num = -1;
 		/*
 		 * We may have already closed the file in the
 		 * close_after_first or finished case above.