summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-04-15 11:28:47 +0200
committerJeremy Allison <jra@samba.org>2013-04-17 14:50:02 -0700
commitaf40d236ea851cab4ad34928fcabf556a153327e (patch)
tree6cbccc9e09ea63bddbf1f09e58a76de7a4d9ec48 /source3
parentf5873c987ca86824863683fcd0f6736880eed4c1 (diff)
downloadsamba-af40d236ea851cab4ad34928fcabf556a153327e.tar.gz
samba-af40d236ea851cab4ad34928fcabf556a153327e.tar.bz2
samba-af40d236ea851cab4ad34928fcabf556a153327e.zip
smbd: Convert rmdir_internals to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/close.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index d41de79878..3ad346332e 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1056,7 +1056,6 @@ static NTSTATUS rmdir_internals(TALLOC_CTX *ctx, files_struct *fsp)
struct smb_filename *smb_dname_full = NULL;
char *fullname = NULL;
bool do_break = true;
- NTSTATUS status;
if (ISDOT(dname) || ISDOTDOT(dname)) {
TALLOC_FREE(talloced);
@@ -1078,12 +1077,10 @@ static NTSTATUS rmdir_internals(TALLOC_CTX *ctx, files_struct *fsp)
goto err_break;
}
- status = create_synthetic_smb_fname(talloc_tos(),
- fullname, NULL,
- NULL,
- &smb_dname_full);
- if (!NT_STATUS_IS_OK(status)) {
- errno = map_errno_from_nt_status(status);
+ smb_dname_full = synthetic_smb_fname(
+ talloc_tos(), fullname, NULL, NULL);
+ if (smb_dname_full == NULL) {
+ errno = ENOMEM;
goto err_break;
}