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

s3: smbd: Convert smb2_file_rename_information() to use filename_convert_dirfsp().

Browse Source 
One less use of filename_convert().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Jeremy Allison 2022-07-28 12:29:22 -07:00
parent 3b3cab8188
commit e960f4b30b
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/smbd/smb2_trans2.c
View File

@ -4951,9 +4951,11 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
bool overwrite;
uint32_t len;
char *newname = NULL;
struct files_struct *dst_dirfsp = NULL;
struct smb_filename *smb_fname_dst = NULL;
const char *dst_original_lcomp = NULL;
uint32_t ucf_flags = ucf_flags_from_smb_request(req);
NTTIME dst_twrp = 0;
NTSTATUS status = NT_STATUS_OK;
TALLOC_CTX *ctx = talloc_tos();
@ -5011,12 +5013,16 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
goto out;
}
} else {
status = filename_convert(ctx,
conn,
newname,
ucf_flags,
0,
&smb_fname_dst);
if (ucf_flags & UCF_GMT_PATHNAME) {
extract_snapshot_token(newname, &dst_twrp);
}
status = filename_convert_dirfsp(ctx,
conn,
newname,
ucf_flags,
dst_twrp,
&dst_dirfsp,
&smb_fname_dst);
if (!NT_STATUS_IS_OK(status)) {
goto out;
}