From: Volker Lendecke <vl@samba.org>
Date: Mon, 15 Apr 2013 09:28:47 +0000 (+0200)
Subject: smbd: Convert rmdir_internals to synthetic_smb_fname
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=af40d236ea851cab4ad34928fcabf556a153327e

smbd: Convert rmdir_internals to synthetic_smb_fname

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index d41de7987829..3ad346332e58 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;
 			}