From: Jeremy Allison <jra@samba.org>
Date: Wed, 26 May 2021 18:47:36 +0000 (-0700)
Subject: s3: smbd: check_reduced_name_with_privilege(), parent_smb_fname() -> SMB_VFS_PARENT_P... 
X-Git-Tag: tevent-0.11.0~671
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7dc7a2c04823e8a472b51d1728c840d7c88bd961;p=thirdparty%2Fsamba.git

s3: smbd: check_reduced_name_with_privilege(), parent_smb_fname() -> SMB_VFS_PARENT_PATHNAME().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index e79ca25ab34..12662774cd1 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1144,19 +1144,17 @@ NTSTATUS check_reduced_name_with_privilege(connection_struct *conn,
 	int ret;
 	struct smb_filename *parent_name = NULL;
 	struct smb_filename *file_name = NULL;
-	bool ok;
 
 	DEBUG(3,("check_reduced_name_with_privilege [%s] [%s]\n",
 			smb_fname->base_name,
 			conn->connectpath));
 
-
-	ok = parent_smb_fname(ctx,
-			      smb_fname,
-			      &parent_name,
-			      &file_name);
-	if (!ok) {
-		status = NT_STATUS_NO_MEMORY;
+	status = SMB_VFS_PARENT_PATHNAME(conn,
+					 ctx,
+					 smb_fname,
+					 &parent_name,
+					 &file_name);
+	if (!NT_STATUS_IS_OK(status)) {
 		goto err;
 	}