summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-04-15 11:27:35 +0200
committerJeremy Allison <jra@samba.org>2013-04-17 14:50:02 -0700
commitf5873c987ca86824863683fcd0f6736880eed4c1 (patch)
treeeb7a2e0a5fd01233feaa03fd1c4dc5a90e033923
parent39470c80562fe5b7db41b09e890495f4eba4c709 (diff)
downloadsamba-f5873c987ca86824863683fcd0f6736880eed4c1.tar.gz
samba-f5873c987ca86824863683fcd0f6736880eed4c1.tar.bz2
samba-f5873c987ca86824863683fcd0f6736880eed4c1.zip
smbd: Convert recursive_rmdir to synthetic_smb_fname
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/smbd/close.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index a7c6b3e373..d41de79878 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -903,7 +903,6 @@ bool recursive_rmdir(TALLOC_CTX *ctx,
struct smb_filename *smb_dname_full = NULL;
char *fullname = NULL;
bool do_break = true;
- NTSTATUS status;
if (ISDOT(dname) || ISDOTDOT(dname)) {
TALLOC_FREE(talloced);
@@ -926,10 +925,10 @@ bool recursive_rmdir(TALLOC_CTX *ctx,
goto err_break;
}
- status = create_synthetic_smb_fname(talloc_tos(), fullname,
- NULL, NULL,
- &smb_dname_full);
- if (!NT_STATUS_IS_OK(status)) {
+ smb_dname_full = synthetic_smb_fname(talloc_tos(), fullname,
+ NULL, NULL);
+ if (smb_dname_full == NULL) {
+ errno = ENOMEM;
goto err_break;
}