From: Ralph Boehme <slow@samba.org>
Date: Tue, 28 Apr 2020 15:08:53 +0000 (+0200)
Subject: smbd: use parent_smb_fname() in smb_unix_mknod()
X-Git-Tag: ldb-2.2.0~823
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adf75b8cef7887913965b7ced2618723fbe74992;p=thirdparty%2Fsamba.git

smbd: use parent_smb_fname() in smb_unix_mknod()

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

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 19706d32bd5..37947d8139c 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -8143,14 +8143,21 @@ static NTSTATUS smb_unix_mknod(connection_struct *conn,
  	 */
 
 	if (lp_inherit_permissions(SNUM(conn))) {
-		char *parent;
-		if (!parent_dirname(talloc_tos(), smb_fname->base_name,
-				    &parent, NULL)) {
+		struct smb_filename *parent_fname = NULL;
+		bool ok;
+
+		ok = parent_smb_fname(talloc_tos(),
+				      smb_fname,
+				      &parent_fname,
+				      NULL);
+		if (!ok) {
 			return NT_STATUS_NO_MEMORY;
 		}
-		inherit_access_posix_acl(conn, parent, smb_fname,
+		inherit_access_posix_acl(conn,
+					 parent_fname->base_name,
+					 smb_fname,
 					 unixmode);
-		TALLOC_FREE(parent);
+		TALLOC_FREE(parent_fname);
 	}
 
 	return NT_STATUS_OK;