sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

smbd: remove now unneccessary wrapper vfs_fget_dos_attributes()

Browse Source 
Signed-off-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Nov 14 00:10:19 UTC 2023 on atb-devel-224
This commit is contained in:
Ralph Boehme 2023-11-10 10:01:46 +01:00 committed by Jeremy Allison
parent 7dca8a9686
commit b649007a53
4 changed files with 7 additions and 18 deletions
source3
include
proto.h
smbd
dosmode.copen.cvfs.c

3
source3/include/proto.h

@ -82,9 +82,6 @@ NTSTATUS vfs_at_fspcwd(TALLOC_CTX *mem_ctx,
struct connection_struct *conn, struct connection_struct *conn,
struct files_struct **_fsp); struct files_struct **_fsp);
NTSTATUS vfs_fget_dos_attributes(struct files_struct *fsp,
uint32_t *dosmode);
#include "source3/lib/interface.h" #include "source3/lib/interface.h"
/* The following definitions come from lib/ldap_debug_handler.c */ /* The following definitions come from lib/ldap_debug_handler.c */

4
source3/smbd/dosmode.c

@ -715,7 +715,9 @@ uint32_t fdos_mode(struct files_struct *fsp)
} }
/* Get the DOS attributes via the VFS if we can */ /* Get the DOS attributes via the VFS if we can */
status = vfs_fget_dos_attributes(fsp, &result); status = SMB_VFS_FGET_DOS_ATTRIBUTES(fsp->conn,
metadata_fsp(fsp),
&result);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
/* /*
* Only fall back to using UNIX modes if we get NOT_IMPLEMENTED. * Only fall back to using UNIX modes if we get NOT_IMPLEMENTED.

5
source3/smbd/open.c

@ -3906,7 +3906,10 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
*/ */
uint32_t attr = 0; uint32_t attr = 0;
status = vfs_fget_dos_attributes(smb_fname->fsp, &attr); status = SMB_VFS_FGET_DOS_ATTRIBUTES(
conn,
metadata_fsp(smb_fname->fsp),
&attr);
if (NT_STATUS_IS_OK(status)) { if (NT_STATUS_IS_OK(status)) {
existing_dos_attributes = attr; existing_dos_attributes = attr;
} }

13
source3/smbd/vfs.c

@ -1297,19 +1297,6 @@ NTSTATUS vfs_at_fspcwd(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK; return NT_STATUS_OK;
} }
NTSTATUS vfs_fget_dos_attributes(struct files_struct *fsp,
uint32_t *dosmode)
{
NTSTATUS status;
/*
* Make sure to pass the base_fsp to the VFS
*/
status = SMB_VFS_FGET_DOS_ATTRIBUTES(
fsp->conn, metadata_fsp(fsp), dosmode);
return status;
}
static struct smb_vfs_deny_state *smb_vfs_deny_global; static struct smb_vfs_deny_state *smb_vfs_deny_global;
void smb_vfs_assert_allowed(void) void smb_vfs_assert_allowed(void)