From: Volker Lendecke <vl@samba.org>
Date: Tue, 31 Jan 2012 21:26:23 +0000 (+0100)
Subject: s3: Delete streams on directories
X-Git-Tag: tevent-0.9.15~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92b96ac84bea5aa8ca37ea6ca17376199aef4142;p=thirdparty%2Fsamba.git

s3: Delete streams on directories
---

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 131f4bf5d1f..42e88d82ea3 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1088,6 +1088,17 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp,
 
 		TALLOC_FREE(lck);
 
+		if ((fsp->conn->fs_capabilities & FILE_NAMED_STREAMS)
+		    && !is_ntfs_stream_smb_fname(fsp->fsp_name)) {
+
+			status = delete_all_streams(fsp->conn, fsp->fsp_name->base_name);
+			if (!NT_STATUS_IS_OK(status)) {
+				DEBUG(5, ("delete_all_streams failed: %s\n",
+					  nt_errstr(status)));
+				goto out;
+			}
+		}
+
 		status = rmdir_internals(talloc_tos(), fsp);
 
 		DEBUG(5,("close_directory: %s. Delete on close was set - "