]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: In inherit_new_acl(), parent_smb_fname() -> SMB_VFS_PARENT_PATHNAME().
authorJeremy Allison <jra@samba.org>
Wed, 26 May 2021 19:17:29 +0000 (12:17 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 2 Jun 2021 05:39:30 +0000 (05:39 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/open.c

index 85e13e3a39fa7371e96ec6d09f25b10525c90793..bd42eb62f126cf0c526ac1a22f43ab5ac9b401f6 100644 (file)
@@ -5106,13 +5106,14 @@ static NTSTATUS inherit_new_acl(files_struct *fsp)
        struct smb_filename *parent_dir = NULL;
        bool ok;
 
-       ok = parent_smb_fname(frame,
-                             fsp->fsp_name,
-                             &parent_dir,
-                             NULL);
-       if (!ok) {
+       status = SMB_VFS_PARENT_PATHNAME(fsp->conn,
+                                        frame,
+                                        fsp->fsp_name,
+                                        &parent_dir,
+                                        NULL);
+       if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(frame);
-               return NT_STATUS_NO_MEMORY;
+               return status;
        }
 
        status = SMB_VFS_GET_NT_ACL_AT(fsp->conn,