s3: smbd: Fix possible directory fd leak if the underlying OS doesn't…

… support fdopendir() HPUX has this problem. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13270 Signed-off-by: Jeremy Allison <[email protected]> Reviewed-by: Ralph Boehme <[email protected]> Autobuild-User(master): Ralph Böhme <[email protected]> Autobuild-Date(master): Fri Feb 23 22:56:35 CET 2018 on sn-devel-144
selsky · Feb 23, 2018 · 5ad5e79 · 5ad5e79
1 parent 06601b3
commit 5ad5e79
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c
@@ -343,11 +343,14 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
 	if (in_flags & SMB2_CONTINUE_FLAG_REOPEN) {
 		int flags;
 
-		dptr_CloseDir(fsp);
+		status = fd_close(fsp);
+		if (tevent_req_nterror(req, status)) {
+			return tevent_req_post(req, ev);
+		}
 
 		/*
-		 * dptr_CloseDir() will close and invalidate the fsp's file
-		 * descriptor, we have to reopen it.
+		 * fd_close() will close and invalidate the fsp's file
+		 * descriptor. So we have to reopen it.
 		 */
 
 		flags = O_RDONLY;