From 9cd853da6bf3e942f5f3c8bee1d4e13ba99e4b06 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 26 May 2021 11:00:49 -0700 Subject: [PATCH] s3: VFS: acl_common. parent_smb_fname() -> SMB_VFS_PARENT_PATHNAME(). Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/modules/vfs_acl_common.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index 39afdcb1cf3..0615c06c81b 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -1200,7 +1200,7 @@ static int acl_common_remove_object(vfs_handle_struct *handle, struct smb_filename *parent_dir_fname = NULL; int saved_errno = 0; struct smb_filename *saved_dir_fname = NULL; - bool ok; + NTSTATUS status; saved_dir_fname = vfs_GetWd(talloc_tos(),conn); if (saved_dir_fname == NULL) { @@ -1215,12 +1215,13 @@ static int acl_common_remove_object(vfs_handle_struct *handle, goto out; } - ok = parent_smb_fname(talloc_tos(), - full_fname, - &parent_dir_fname, - &local_fname); - if (!ok) { - saved_errno = ENOMEM; + status = SMB_VFS_PARENT_PATHNAME(conn, + talloc_tos(), + full_fname, + &parent_dir_fname, + &local_fname); + if (!NT_STATUS_IS_OK(status)) { + saved_errno = map_errno_from_nt_status(status); goto out; } -- 2.47.3