sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3: VFS: media_harmony: Fix mh_linkat() to cope with real directory fsps.

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2021-02-03 12:36:27 -08:00
parent 2952cfe0ed
commit 035909ec59
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source3/modules/vfs_media_harmony.c
View File

@ -1721,12 +1721,34 @@ static int mh_linkat(vfs_handle_struct *handle,
int flags)
{
int status;
struct smb_filename *old_full_fname = NULL;
struct smb_filename *oldclientFname = NULL;
struct smb_filename *new_full_fname = NULL;
struct smb_filename *newclientFname = NULL;
DEBUG(MH_INFO_DEBUG, ("Entering mh_linkat\n"));
if (!is_in_media_files(old_smb_fname->base_name) &&
!is_in_media_files(new_smb_fname->base_name)) {
old_full_fname = full_path_from_dirfsp_atname(talloc_tos(),
srcfsp,
old_smb_fname);
if (old_full_fname == NULL) {
status = -1;
goto err;
}
new_full_fname = full_path_from_dirfsp_atname(talloc_tos(),
dstfsp,
new_smb_fname);
if (new_full_fname == NULL) {
status = -1;
goto err;
}
if (!is_in_media_files(old_full_fname->base_name) &&
!is_in_media_files(new_full_fname->base_name)) {
TALLOC_FREE(old_full_fname);
TALLOC_FREE(new_full_fname);
status = SMB_VFS_NEXT_LINKAT(handle,
srcfsp,
old_smb_fname,
@ -1737,24 +1759,26 @@ static int mh_linkat(vfs_handle_struct *handle,
}
if ((status = alloc_get_client_smb_fname(handle, talloc_tos(),
old_smb_fname,
old_full_fname,
&oldclientFname))) {
goto err;
}
if ((status = alloc_get_client_smb_fname(handle, talloc_tos(),
new_smb_fname,
new_full_fname,
&newclientFname))) {
goto err;
}
status = SMB_VFS_NEXT_LINKAT(handle,
srcfsp,
handle->conn->cwd_fsp,
oldclientFname,
dstfsp,
handle->conn->cwd_fsp,
newclientFname,
flags);
err:
TALLOC_FREE(old_full_fname);
TALLOC_FREE(new_full_fname);
TALLOC_FREE(newclientFname);
TALLOC_FREE(oldclientFname);
out: