diff options
| author | Volker Lendecke <vl@samba.org> | 2013-04-12 11:17:00 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-04-17 14:49:58 -0700 |
| commit | 19e88da1dcbc553d443b4c224d186ccda09672b6 (patch) | |
| tree | 883c35d2f9091d77b6b5620edf3cebae9b35d3be | |
| parent | 3dafdd3c0b9523f65205254b5ad98e8959580f93 (diff) | |
| download | samba-19e88da1dcbc553d443b4c224d186ccda09672b6.tar.gz samba-19e88da1dcbc553d443b4c224d186ccda09672b6.tar.bz2 samba-19e88da1dcbc553d443b4c224d186ccda09672b6.zip | |
vfs: Convert recycle_unlink to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/modules/vfs_recycle.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index ed9a28091f..00d7f34f2f 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -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; } |