From: Jeremy Allison Date: Wed, 17 Jul 2019 20:54:43 +0000 (-0700) Subject: s3: smbd: Remove dptr_close() from call_trans2findnext(). X-Git-Tag: tdb-1.4.2~339 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=779dd3f1e6bc462057a8f367d6c7cbb5cd75d4ba;p=thirdparty%2Fsamba.git s3: smbd: Remove dptr_close() from call_trans2findnext(). Now we're handle-based close_file() already does what is needed to shut down directory enumeration. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index cddcd805578..318676f76d1 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3492,7 +3492,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd /* Check if we can close the fsp->dptr */ if(close_after_request || (finished && close_if_end)) { DEBUG(5,("call_trans2findnext: closing dptr_num = %d\n", dptr_num)); - dptr_close(sconn, &dptr_num); /* This frees up the saved mask */ + dptr_num = -1; close_file(NULL, fsp, NORMAL_CLOSE); fsp = NULL; }