sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3: smbd: Use get_original_lcomp() inside smb_file_rename_information().

Browse Source 
Pass to rename_internals_fsp() and rename_internals().

Removes the last uses of the struct member original_lcomp
outside of the filename and struct util copying code.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2020-03-26 16:18:53 -07:00 committed by Ralph Boehme
parent d7f2143206
commit 5104ec8dec
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source3/smbd/trans2.c
View File

@ -7293,6 +7293,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
uint32_t len;
char *newname = NULL;
struct smb_filename *smb_fname_dst = NULL;
const char *dst_original_lcomp = NULL;
bool dest_has_wcard = False;
NTSTATUS status = NT_STATUS_OK;
char *p;
@ -7361,12 +7362,14 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
}
/*
* Set the original last component, since
* Get the original last component, since
* rename_internals_fsp() requires it.
*/
smb_fname_dst->original_lcomp = talloc_strdup(smb_fname_dst,
newname);
if (smb_fname_dst->original_lcomp == NULL) {
dst_original_lcomp = get_original_lcomp(smb_fname_dst,
conn,
newname,
0);
if (dst_original_lcomp == NULL) {
status = NT_STATUS_NO_MEMORY;
goto out;
}
@ -7442,6 +7445,14 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
goto out;
}
}
dst_original_lcomp = get_original_lcomp(smb_fname_dst,
conn,
newname,
ucf_flags);
if (dst_original_lcomp == NULL) {
status = NT_STATUS_NO_MEMORY;
goto out;
}
}
if (fsp) {
@ -7452,7 +7463,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
status = rename_internals_fsp(conn,
fsp,
smb_fname_dst,
smb_fname_dst->original_lcomp,
dst_original_lcomp,
0,
overwrite);
} else {
@ -7465,7 +7476,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
req,
smb_fname_src,
smb_fname_dst,
smb_fname_dst->original_lcomp,
dst_original_lcomp,
0,
overwrite,
false,