summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-04-12 11:33:38 +0200
committerJeremy Allison <jra@samba.org>2013-04-17 14:49:59 -0700
commit87d92093afd0b22bd826eae95881e9714a6dd12e (patch)
treececac8f7d414fead342ef51976234bab1b6de885
parent1729d786928957c37062f19582c52871c12b90b6 (diff)
downloadsamba-87d92093afd0b22bd826eae95881e9714a6dd12e.tar.gz
samba-87d92093afd0b22bd826eae95881e9714a6dd12e.tar.bz2
samba-87d92093afd0b22bd826eae95881e9714a6dd12e.zip
vfs: Convert streams_depot_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_streams_depot.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index ab8bde5ba1..782b830c7b 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -600,7 +600,6 @@ static int streams_depot_unlink(vfs_handle_struct *handle,
const struct smb_filename *smb_fname)
{
struct smb_filename *smb_fname_base = NULL;
- NTSTATUS status;
int ret = -1;
DEBUG(10, ("streams_depot_unlink called for %s\n",
@@ -610,6 +609,7 @@ static int streams_depot_unlink(vfs_handle_struct *handle,
if (is_ntfs_stream_smb_fname(smb_fname) &&
!is_ntfs_default_stream_smb_fname(smb_fname)) {
struct smb_filename *smb_fname_stream = NULL;
+ NTSTATUS status;
status = stream_smb_fname(handle, smb_fname, &smb_fname_stream,
false);
@@ -628,10 +628,10 @@ static int streams_depot_unlink(vfs_handle_struct *handle,
* We potentially need to delete the per-inode streams directory
*/
- status = create_synthetic_smb_fname(talloc_tos(), smb_fname->base_name,
- NULL, NULL, &smb_fname_base);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_base = synthetic_smb_fname(
+ talloc_tos(), smb_fname->base_name, NULL, NULL);
+ if (smb_fname_base == NULL) {
+ errno = ENOMEM;
return -1;
}