From: Jeremy Allison <jra@samba.org>
Date: Wed, 17 Jul 2019 17:36:20 +0000 (-0700)
Subject: s3: smbd: Prepare for SMB1 directory handle opens in dptr_closecnum().
X-Git-Tag: tdb-1.4.2~366
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa3a087193b23001bd7a17e30644b5cbeb0119eb;p=thirdparty%2Fsamba.git

s3: smbd: Prepare for SMB1 directory handle opens in dptr_closecnum().

Call close_file() on any SMB1 directory handle once the dptr is closed.

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 7483e6f5de4..0b760ed9b73 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -277,7 +277,17 @@ void dptr_closecnum(connection_struct *conn)
 		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;
+			}
 		}
 	}
 }