sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

vfs: Convert recycle_unlink to synthetic_smb_fname

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-12 11:17:00 +02:00
committed by Jeremy Allison
parent 3dafdd3c0b
commit 19e88da1dc
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source3/modules/vfs_recycle.c
View File

@ -442,7 +442,6 @@ static int recycle_unlink(vfs_handle_struct *handle,
off_t maxsize, minsize;
off_t file_size; /* space_avail; */
bool exist;
NTSTATUS status;
int rc = -1;
repository = talloc_sub_advanced(NULL, lp_servicename(talloc_tos(), SNUM(conn)),
@ -575,10 +574,9 @@ static int recycle_unlink(vfs_handle_struct *handle,
}
/* Create smb_fname with final base name and orig stream name. */
status = create_synthetic_smb_fname(talloc_tos(), final_name,
smb_fname->stream_name, NULL,
&smb_fname_final);
if (!NT_STATUS_IS_OK(status)) {
smb_fname_final = synthetic_smb_fname(talloc_tos(), final_name,
smb_fname->stream_name, NULL);
if (smb_fname_final == NULL) {
rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
goto done;
}