summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-04-11 16:17:42 +0200
committerJeremy Allison <jra@samba.org>2013-04-17 14:49:56 -0700
commitacf70b9e068e862be40fe69d5b74da6d8728c987 (patch)
treec317efe1e04db6590f800f51517dfde5b226ebd2
parent4d3184e96c5fc2e77df83556cfa9ed6a13448b72 (diff)
downloadsamba-acf70b9e068e862be40fe69d5b74da6d8728c987.tar.gz
samba-acf70b9e068e862be40fe69d5b74da6d8728c987.tar.bz2
samba-acf70b9e068e862be40fe69d5b74da6d8728c987.zip
vfs: Convert cap_unlink to cp_smb_filename
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/modules/vfs_cap.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 67a76f7c20..895522b5e8 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -231,7 +231,6 @@ static int cap_unlink(vfs_handle_struct *handle,
{
struct smb_filename *smb_fname_tmp = NULL;
char *cappath = NULL;
- NTSTATUS status;
int ret;
cappath = capencode(talloc_tos(), smb_fname->base_name);
@@ -241,10 +240,9 @@ static int cap_unlink(vfs_handle_struct *handle,
}
/* Setup temporary smb_filename structs. */
- status = copy_smb_filename(talloc_tos(), smb_fname,
- &smb_fname_tmp);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
+ if (smb_fname_tmp == NULL) {
+ errno = ENOMEM;
return -1;
}