From: Jeremy Allison <jra@samba.org>
Date: Fri, 13 Sep 2019 20:30:19 +0000 (-0700)
Subject: s3: VFS: vfs_fruit: Add dirfsp files_struct pointer parameter to fruit_rmdir_internal().
X-Git-Tag: talloc-2.3.1~604
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92d8b3b847794ca5c5cd02c3c28b5f3d96540fdc;p=thirdparty%2Fsamba.git

s3: VFS: vfs_fruit: Add dirfsp files_struct pointer parameter to fruit_rmdir_internal().

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

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 32cff226218..f206995fe2e 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2099,6 +2099,7 @@ static int fruit_chown(vfs_handle_struct *handle,
 }
 
 static int fruit_rmdir_internal(struct vfs_handle_struct *handle,
+			struct files_struct *dirfsp,
 			const struct smb_filename *smb_fname)
 {
 	DIR *dh = NULL;
@@ -2179,6 +2180,7 @@ static int fruit_rmdir(struct vfs_handle_struct *handle,
 			const struct smb_filename *smb_fname)
 {
 	return fruit_rmdir_internal(handle,
+				handle->conn->cwd_fsp,
 				smb_fname);
 }
 
@@ -2199,7 +2201,9 @@ static int fruit_unlinkat(vfs_handle_struct *handle,
 
 	SMB_ASSERT(dirfsp == dirfsp->conn->cwd_fsp);
 	if (flags & AT_REMOVEDIR) {
-		ret = fruit_rmdir(handle, smb_fname);
+		ret = fruit_rmdir_internal(handle,
+				dirfsp,
+				smb_fname);
 	} else {
 		ret = fruit_unlink_internal(handle,
 				dirfsp,