]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: open_directory(), smbd_calculate_access_mask() -> smbd_calculate_access_mas...
authorJeremy Allison <jra@samba.org>
Tue, 8 Jun 2021 00:19:25 +0000 (17:19 -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 2d7bcd164afbf0fa60bf52e34ff43c7f8182b7f5..e4a345a90ad67968eecf4b399fa9701053478f43 100644 (file)
@@ -4577,17 +4577,15 @@ static NTSTATUS open_directory(connection_struct *conn,
                 create_disposition,
                 file_attributes);
 
-       status = smbd_calculate_access_mask(conn,
-                                       conn->cwd_fsp,
-                                       smb_dname,
+       status = smbd_calculate_access_mask_fsp(smb_dname->fsp,
                                        false,
                                        access_mask,
                                        &access_mask);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("open_directory: smbd_calculate_access_mask "
+               DBG_DEBUG("smbd_calculate_access_mask_fsp "
                        "on file %s returned %s\n",
                        smb_fname_str_dbg(smb_dname),
-                       nt_errstr(status)));
+                       nt_errstr(status));
                return status;
        }