From af40d236ea851cab4ad34928fcabf556a153327e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 15 Apr 2013 11:28:47 +0200 Subject: smbd: Convert rmdir_internals to synthetic_smb_fname Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/smbd/close.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'source3/smbd') 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; } -- cgit