]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: open_file_ntcreate(), smbd_calculate_access_mask() -> smbd_calculate_access...
authorJeremy Allison <jra@samba.org>
Tue, 8 Jun 2021 00:17:40 +0000 (17:17 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 9 Jun 2021 13:14:31 +0000 (13:14 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/open.c

index f24e0474189b936988fda7dd8d045d0f5e4e3689..2d7bcd164afbf0fa60bf52e34ff43c7f8182b7f5 100644 (file)
@@ -3813,16 +3813,15 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                }
        }
 
-       status = smbd_calculate_access_mask(conn,
-                                       conn->cwd_fsp,
-                                       smb_fname,
-                                       false,
-                                       access_mask,
-                                       &access_mask);
+       status = smbd_calculate_access_mask_fsp(smb_fname->fsp,
+                                               false,
+                                               access_mask,
+                                               &access_mask);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("open_file_ntcreate: smbd_calculate_access_mask "
+               DBG_DEBUG("smbd_calculate_access_mask_fsp "
                        "on file %s returned %s\n",
-                       smb_fname_str_dbg(smb_fname), nt_errstr(status)));
+                       smb_fname_str_dbg(smb_fname),
+                       nt_errstr(status));
                return status;
        }