sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

vfs: Convert cap_rename to cp_smb_filename

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2013-04-11 16:16:58 +02:00
committed by Jeremy Allison
parent fb7afce2d3
commit 4d3184e96c
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source3/modules/vfs_cap.c
View File

@ -143,7 +143,6 @@ static int cap_rename(vfs_handle_struct *handle,
char *capnew = NULL;
struct smb_filename *smb_fname_src_tmp = NULL;
struct smb_filename *smb_fname_dst_tmp = NULL;
NTSTATUS status;
int ret = -1;
capold = capencode(talloc_tos(), smb_fname_src->base_name);
@ -154,16 +153,14 @@ static int cap_rename(vfs_handle_struct *handle,
}
/* Setup temporary smb_filename structs. */
status = copy_smb_filename(talloc_tos(), smb_fname_src,
&smb_fname_src_tmp);
if (!NT_STATUS_IS_OK(status)) {
errno = map_errno_from_nt_status(status);
smb_fname_src_tmp = cp_smb_filename(talloc_tos(), smb_fname_src);
if (smb_fname_src_tmp == NULL) {
errno = ENOMEM;
goto out;
}
status = copy_smb_filename(talloc_tos(), smb_fname_dst,
&smb_fname_dst_tmp);
if (!NT_STATUS_IS_OK(status)) {
errno = map_errno_from_nt_status(status);
smb_fname_dst_tmp = cp_smb_filename(talloc_tos(), smb_fname_dst);
if (smb_fname_dst_tmp == NULL) {
errno = ENOMEM;
goto out;
}