sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

vfs_full_audit: Rename argument of flock function

Browse Source 
MS-SMB2 and the smbd code refer to this field as share_access. Use the
same name in the function argument.

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Christof Schmitt 2020-01-03 12:38:00 -07:00 committed by Jeremy Allison
parent 83f59ac00e
commit 4667399457
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/modules/vfs_default.c
View File

@ -2587,10 +2587,10 @@ static bool vfswrap_lock(vfs_handle_struct *handle, files_struct *fsp, int op, o
}
static int vfswrap_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
uint32_t share_mode, uint32_t access_mask)
uint32_t share_access, uint32_t access_mask)
{
START_PROFILE(syscall_kernel_flock);
kernel_flock(fsp->fh->fd, share_mode, access_mask);
kernel_flock(fsp->fh->fd, share_access, access_mask);
END_PROFILE(syscall_kernel_flock);
return 0;
}

8
source3/modules/vfs_full_audit.c
View File

@ -1693,11 +1693,15 @@ static bool smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
static int smb_full_audit_kernel_flock(struct vfs_handle_struct *handle,
struct files_struct *fsp,
uint32_t share_mode, uint32_t access_mask)
uint32_t share_access,
uint32_t access_mask)
{
int result;
result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask);
result = SMB_VFS_NEXT_KERNEL_FLOCK(handle,
fsp,
share_access,
access_mask);
do_log(SMB_VFS_OP_KERNEL_FLOCK, (result >= 0), handle, "%s",
fsp_str_do_log(fsp));