From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Oct 2019 22:14:21 +0000 (-0700)
Subject: s3: VFS: vfs_streams_depot: Add a dirfsp parameter to streams_depot_rmdir_internal().
X-Git-Tag: talloc-2.3.1~422
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=d9091d8fa96645886e7fb35ac95ed0f5b2f5c72a;hp=48ad93aec53e547de5919ec13056c7a4fd5cbf02

s3: VFS: vfs_streams_depot: Add a dirfsp parameter to streams_depot_rmdir_internal().

Not yet used.

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 02b0fdf5414..7850d7a7691 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -741,7 +741,8 @@ static int streams_depot_unlink_internal(vfs_handle_struct *handle,
 }
 
 static int streams_depot_rmdir_internal(vfs_handle_struct *handle,
-				const struct smb_filename *smb_fname)
+			struct files_struct *dirfsp,
+			const struct smb_filename *smb_fname)
 {
 	struct smb_filename *smb_fname_base = NULL;
 	int ret = -1;
@@ -820,7 +821,9 @@ static int streams_depot_unlinkat(vfs_handle_struct *handle,
 	int ret;
 	SMB_ASSERT(dirfsp == dirfsp->conn->cwd_fsp);
 	if (flags & AT_REMOVEDIR) {
-		ret = streams_depot_rmdir_internal(handle, smb_fname);
+		ret = streams_depot_rmdir_internal(handle,
+				dirfsp,
+				smb_fname);
 	} else {
 		ret = streams_depot_unlink_internal(handle,
 				dirfsp,
@@ -834,6 +837,7 @@ static int streams_depot_rmdir(vfs_handle_struct *handle,
 				const struct smb_filename *smb_fname)
 {
 	return streams_depot_rmdir_internal(handle,
+				handle->conn->cwd_fsp,
 				smb_fname);
 }