]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: VFS: vfs_fruit: Add dirfsp files_struct pointer parameter to fruit_rmdir_internal().
authorJeremy Allison <jra@samba.org>
Fri, 13 Sep 2019 20:30:19 +0000 (13:30 -0700)
committerRalph Boehme <slow@samba.org>
Thu, 26 Sep 2019 17:20:49 +0000 (17:20 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/modules/vfs_fruit.c

index 32cff22621891b1bf55ac4354c33d05106bc8519..f206995fe2e4c926923090bfc97b35679a3afba1 100644 (file)
@@ -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,