From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Oct 2019 22:38:45 +0000 (-0700)
Subject: s3: VFS: vfs_streams_depot: Change RMDIR -> UNLINKAT inside stream_dir().
X-Git-Tag: talloc-2.3.1~421
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c5dc89c0b1a3c33840428d04034abe4dcfbbd7b;p=thirdparty%2Fsamba.git

s3: VFS: vfs_streams_depot: Change RMDIR -> UNLINKAT inside stream_dir().

No logic change.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index 7850d7a7691..c48513c2849 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -250,7 +250,10 @@ static char *stream_dir(vfs_handle_struct *handle,
 			      smb_fname_hash->base_name));
 			recursive_rmdir(talloc_tos(), handle->conn,
 					smb_fname_hash);
-			SMB_VFS_NEXT_RMDIR(handle, smb_fname_hash);
+			SMB_VFS_NEXT_UNLINKAT(handle,
+					handle->conn->cwd_fsp,
+					smb_fname_hash,
+					AT_REMOVEDIR);
 		} else {
 			newname = talloc_asprintf(talloc_tos(), "lost-%lu",
 						  random());